[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31961] trunk/blender: bugfix [#23831] Removing an IK Constraint in pose mode still draws bone with IK highlight
Campbell Barton
ideasman42 at gmail.com
Thu Sep 16 09:14:48 CEST 2010
Revision: 31961
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31961
Author: campbellbarton
Date: 2010-09-16 09:14:48 +0200 (Thu, 16 Sep 2010)
Log Message:
-----------
bugfix [#23831] Removing an IK Constraint in pose mode still draws bone with IK highlight
+ moved bone envalope scale into transform menu, pose menu is getting huge.
Modified Paths:
--------------
trunk/blender/release/scripts/ui/space_view3d.py
trunk/blender/source/blender/editors/object/object_constraint.c
trunk/blender/source/blender/editors/transform/transform_ops.c
Modified: trunk/blender/release/scripts/ui/space_view3d.py
===================================================================
--- trunk/blender/release/scripts/ui/space_view3d.py 2010-09-16 06:52:12 UTC (rev 31960)
+++ trunk/blender/release/scripts/ui/space_view3d.py 2010-09-16 07:14:48 UTC (rev 31961)
@@ -151,6 +151,11 @@
layout.operator("transform.shear", text="Shear")
layout.operator("transform.warp", text="Warp")
layout.operator("transform.push_pull", text="Push/Pull")
+
+ obj = context.object
+ if obj.type == 'ARMATURE' and obj.mode in ('EDIT', 'POSE') and obj.data.draw_type in ('BBONE', 'ENVELOPE'):
+ layout.operator("transform.transform", text="Scale Envelope/BBone").mode = 'BONE_SIZE'
+
if context.edit_object and context.edit_object.type == 'ARMATURE':
layout.operator("armature.align")
else:
@@ -1108,8 +1113,6 @@
layout.menu("VIEW3D_MT_transform")
layout.menu("VIEW3D_MT_snap")
- if arm.draw_type in ('BBONE', 'ENVELOPE'):
- layout.operator("transform.transform", text="Scale Envelope Distance").mode = 'BONESIZE'
layout.menu("VIEW3D_MT_pose_transform")
@@ -1849,11 +1852,6 @@
layout.menu("VIEW3D_MT_snap")
layout.menu("VIEW3D_MT_edit_armature_roll")
- if arm.draw_type == 'ENVELOPE':
- layout.operator("transform.transform", text="Scale Envelope Distance").mode = 'BONESIZE'
- else:
- layout.operator("transform.transform", text="Scale B-Bone Width").mode = 'BONESIZE'
-
layout.separator()
layout.operator("armature.extrude_move")
Modified: trunk/blender/source/blender/editors/object/object_constraint.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_constraint.c 2010-09-16 06:52:12 UTC (rev 31960)
+++ trunk/blender/source/blender/editors/object/object_constraint.c 2010-09-16 07:14:48 UTC (rev 31961)
@@ -805,6 +805,8 @@
/* there's no active constraint now, so make sure this is the case */
constraints_set_active(lb, NULL);
+ ED_object_constraint_update(ob); /* needed to set the flags on posebones correctly */
+
/* notifiers */
WM_event_add_notifier(C, NC_OBJECT|ND_CONSTRAINT, ob);
Modified: trunk/blender/source/blender/editors/transform/transform_ops.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_ops.c 2010-09-16 06:52:12 UTC (rev 31960)
+++ trunk/blender/source/blender/editors/transform/transform_ops.c 2010-09-16 07:14:48 UTC (rev 31961)
@@ -752,7 +752,7 @@
{TFM_PUSHPULL, "PUSHPULL", 0, "Pushpull", ""},
{TFM_CREASE, "CREASE", 0, "Crease", ""},
{TFM_MIRROR, "MIRROR", 0, "Mirror", ""},
- {TFM_BONESIZE, "BONESIZE", 0, "Bonesize", ""},
+ {TFM_BONESIZE, "BONE_SIZE", 0, "Bonesize", ""},
{TFM_BONE_ENVELOPE, "BONE_ENVELOPE", 0, "Bone_Envelope", ""},
{TFM_CURVE_SHRINKFATTEN, "CURVE_SHRINKFATTEN", 0, "Curve_Shrinkfatten", ""},
{TFM_BONE_ROLL, "BONE_ROLL", 0, "Bone_Roll", ""},
More information about the Bf-blender-cvs
mailing list