diff --git a/scripts/__bone/__bone.gml b/scripts/__bone/__bone.gml index a836fdda7..11b9a9a42 100644 --- a/scripts/__bone/__bone.gml +++ b/scripts/__bone/__bone.gml @@ -153,7 +153,7 @@ function __Bone(_parent = noone, _distance = 0, _direction = 0, _angle = 0, _len } else if(_hover != noone && _hover[0].ID == self.ID && _hover[1] == 2) { draw_set_color(c_white); - draw_set_alpha(1 * _alpha); + draw_set_alpha(0.75 * _alpha); } else { draw_set_color(COLORS._main_accent); diff --git a/scripts/node_armature/node_armature.gml b/scripts/node_armature/node_armature.gml index 8cb78fcc6..1ce28b9bc 100644 --- a/scripts/node_armature/node_armature.gml +++ b/scripts/node_armature/node_armature.gml @@ -157,12 +157,11 @@ function Node_Armature(_x, _y, _group = noone) : Node(_x, _y, _group) constructo #endregion tools = [ - new NodeTool( "Transform", THEME.bone_tool_move ), - new NodeTool( "Add bones", THEME.bone_tool_add ), - new NodeTool( "Remove bones", THEME.bone_tool_remove ), - new NodeTool( "Detach bones", THEME.bone_tool_detach ), - new NodeTool( "IK", THEME.bone_tool_IK ), - new NodeTool( "Mirror bones", THEME.bone_tool_mirror ), + new NodeTool( "Transform", THEME.bone_tool_move ), + new NodeTool( [ "Add bones", "Mirror bones"], [ THEME.bone_tool_add, THEME.bone_tool_mirror ]), + new NodeTool( "Remove bones", THEME.bone_tool_remove ), + new NodeTool( "Detach bones", THEME.bone_tool_detach ), + new NodeTool( "IK", THEME.bone_tool_IK ), ]; anchor_selecting = noone; diff --git a/scripts/node_armature_pose/node_armature_pose.gml b/scripts/node_armature_pose/node_armature_pose.gml index 484df6af1..86ef6d6b1 100644 --- a/scripts/node_armature_pose/node_armature_pose.gml +++ b/scripts/node_armature_pose/node_armature_pose.gml @@ -157,8 +157,15 @@ function Node_Armature_Pose(_x, _y, _group = noone) : Node(_x, _y, _group) const gpu_set_texfilter(false); - if(posing_input.setValue(val)) - UNDO_HOLDING = true; + if(posing_input.value_from == noone) { + if(posing_input.setValue(val)) UNDO_HOLDING = true; + + } else if(is(posing_input.value_from.node, Node_Vector4)) { + var _nod = posing_input.value_from.node; + + for( var i = 0; i < 4; i++ ) + if(_nod.inputs[i].setValue(val[i])) UNDO_HOLDING = true; + } if(mouse_release(mb_left)) { posing_bone = noone; diff --git a/scripts/node_data/node_data.gml b/scripts/node_data/node_data.gml index e96255851..c1f60cf18 100644 --- a/scripts/node_data/node_data.gml +++ b/scripts/node_data/node_data.gml @@ -681,7 +681,7 @@ function Node(_x, _y, _group = noone) : __Node_Base(_x, _y) constructor { var _ou = preview_channel >= 0 && preview_channel < array_length(outputs) && outputs[preview_channel].type == VALUE_TYPE.surface; var _prev_surf = previewable && preview_draw && (_ps || _ou); - junction_draw_hei_y = SHOW_PARAM? 32 : 16; + junction_draw_hei_y = SHOW_PARAM? 32 : 16; junction_draw_pad_y = SHOW_PARAM? 128 : 24; var _hi, _ho;