[Bf-blender-cvs] [49e409c94f7] PSketch-279: Push Brush: "Shift" now toggles whether we're adjusting the "easing" on each handle
Joshua Leung
noreply at git.blender.org
Tue May 8 18:03:35 CEST 2018
Commit: 49e409c94f70b154b68cc33492c8ce9416e1cf98
Author: Joshua Leung
Date: Tue Jan 2 05:14:52 2018 +1300
Branches: PSketch-279
https://developer.blender.org/rB49e409c94f70b154b68cc33492c8ce9416e1cf98
Push Brush: "Shift" now toggles whether we're adjusting the "easing" on each handle
===================================================================
M source/blender/editors/armature/pose_sculpt.c
===================================================================
diff --git a/source/blender/editors/armature/pose_sculpt.c b/source/blender/editors/armature/pose_sculpt.c
index 4727bbcc5e1..ebefe3fa3ea 100644
--- a/source/blender/editors/armature/pose_sculpt.c
+++ b/source/blender/editors/armature/pose_sculpt.c
@@ -1525,6 +1525,7 @@ static void psculpt_brush_push_apply(tPoseSculptingOp *pso, bPoseChannel *pchan,
bool do_head = false, do_tail = false;
bool do_x = false, do_z = false;
+ bool do_ease = pso->invert;
float fac;
/* skip if bone is not a bendy bone */
@@ -1533,8 +1534,11 @@ static void psculpt_brush_push_apply(tPoseSculptingOp *pso, bPoseChannel *pchan,
return;
}
- /* when invert is true, we don't restrict ourselves to the initial set only (i.e. "push") */
- if ((brush->flag & PSCULPT_BRUSH_FLAG_GRAB_INITIAL) && (pso->invert == false)) {
+ /* only affect bones in the initial set?
+ * NOTE: Unlike the grab brush, shift (invert) doesn't toggle this option,
+ * as we instead save it for adjusting the easing settings.
+ */
+ if (brush->flag & PSCULPT_BRUSH_FLAG_GRAB_INITIAL) {
tab = verify_bone_is_affected(pso, pchan, pso->is_first);
/* if one couldn't be found or added, then it didn't exist the first time round,
More information about the Bf-blender-cvs
mailing list