[Bf-blender-cvs] [ec36e3a] master: Fix T43776: Rigging : Clear User transform is not working when mesh is in weight paint mode.

Bastien Montagne noreply at git.blender.org
Mon Feb 23 12:24:31 CET 2015


Commit: ec36e3ae80f993b3d1185dadd1d2ee5d54978501
Author: Bastien Montagne
Date:   Mon Feb 23 12:23:13 2015 +0100
Branches: master
https://developer.blender.org/rBec36e3ae80f993b3d1185dadd1d2ee5d54978501

Fix T43776: Rigging : Clear User transform is not working when mesh is in weight paint mode.

Use same trick as for regular 'clear transform' operators to get a valid armature
in weight paint mode (where active object is weight-painted one).

===================================================================

M	source/blender/editors/armature/pose_transform.c
M	source/blender/editors/screen/screen_ops.c

===================================================================

diff --git a/source/blender/editors/armature/pose_transform.c b/source/blender/editors/armature/pose_transform.c
index 0cde8f3..fbf6dcc 100644
--- a/source/blender/editors/armature/pose_transform.c
+++ b/source/blender/editors/armature/pose_transform.c
@@ -811,7 +811,7 @@ void POSE_OT_transforms_clear(wmOperatorType *ot)
 static int pose_clear_user_transforms_exec(bContext *C, wmOperator *op)
 {
 	Scene *scene = CTX_data_scene(C);
-	Object *ob = CTX_data_active_object(C);
+	Object *ob = BKE_object_pose_armature_get(CTX_data_active_object(C));
 	float cframe = (float)CFRA;
 	const bool only_select = RNA_boolean_get(op->ptr, "only_selected");
 	
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c
index 99ce1a0..48d3902 100644
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@ -391,7 +391,7 @@ int ED_operator_editarmature(bContext *C)
  * \brief check for pose mode (no mixed modes)
  *
  * We want to enable most pose operations in weight paint mode,
- * when it comes to transforming bones, but managing bomes layers/groups
+ * when it comes to transforming bones, but managing bones layers/groups
  * can be left for pose mode only. (not weight paint mode)
  */
 int ED_operator_posemode_exclusive(bContext *C)




More information about the Bf-blender-cvs mailing list