Commit: 89c8d3cd45e1a56cc255d8343d052f8f0ce6df9b
Author: Campbell Barton
Date: Thu Apr 6 12:41:02 2017 +1000
Branches: custom-manipulators
https://developer.blender.org/rB89c8d3cd45e1a56cc255d8343d052f8f0ce6df9b
Remove BKE_pose_where_is from protectflag_to_drawflags_pchan
===================================================================
M source/blender/editors/transform/transform_manipulator.c
===================================================================
diff --git a/source/blender/editors/transform/transform_manipulator.c
b/source/blender/editors/transform/transform_manipulator.c
index 4390af496c2..6931b60cfb6 100644
--- a/source/blender/editors/transform/transform_manipulator.c
+++ b/source/blender/editors/transform/transform_manipulator.c
@@ -478,15 +478,9 @@ static void protectflag_to_drawflags(short protectflag,
short *drawflags)
}
/* for pose mode */
-static void protectflag_to_drawflags_pchan(Scene *scene, Object *ob,
RegionView3D *rv3d, bPoseChannel *pchan)
+static void protectflag_to_drawflags_pchan(RegionView3D *rv3d, bPoseChannel
*pchan)
{
- Bone *bone = pchan->bone;
- if (bone) {
- /* update pose matrix after transform */
- BKE_pose_where_is(scene, ob);
-
- protectflag_to_drawflags(pchan->protectflag, &rv3d->twdrawflag);
- }
+ protectflag_to_drawflags(pchan->protectflag, &rv3d->twdrawflag);
}
/* for editmode*/
@@ -867,7 +861,7 @@ static int calc_manipulator_stats(const bContext *C)
Bone *bone = pchan->bone;
if (bone) {
calc_tw_center(scene, pchan->pose_head);
- protectflag_to_drawflags_pchan(scene, ob, rv3d,
pchan);
+ protectflag_to_drawflags_pchan(rv3d, pchan);
totsel = 1;
ok = true;
}
@@ -881,7 +875,7 @@ static int calc_manipulator_stats(const bContext *C)
Bone *bone = pchan->bone;
if (bone && (bone->flag &
BONE_TRANSFORM)) {
calc_tw_center(scene,
pchan->pose_head);
-
protectflag_to_drawflags_pchan(scene, ob, rv3d, pchan);
+
protectflag_to_drawflags_pchan(rv3d, pchan);
}
}
ok = true;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
