diff options
| author | Joshua Leung <aligorith@gmail.com> | 2009-11-29 08:56:39 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2009-11-29 08:56:39 +0300 |
| commit | 7c21fa3b721d196f00a5e4d0745f1334f1c22459 (patch) | |
| tree | d9b7832ce364004c81710c475800697377f76005 /source/blender/editors/armature | |
| parent | 625a360b4b1f70262931294a4bff6bec244cd8c4 (diff) | |
Armature Bugfixes:
* Bugfix #20136: unclear tool tip for inherit rotation toggle
* Bugfix for Apply Pose as Restpose (Ctrl A in Pose Mode): missing call to free edit-data was causing drawing code to only draw editbones until editmode was entered + toggled
* Added missing notifier for deleting F-Modifiers, so deleting F-Modifiers now updates the view correctly afterwards
Diffstat (limited to 'source/blender/editors/armature')
| -rw-r--r-- | source/blender/editors/armature/editarmature.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/editors/armature/editarmature.c b/source/blender/editors/armature/editarmature.c index f8aacd3112d..95b743a7b27 100644 --- a/source/blender/editors/armature/editarmature.c +++ b/source/blender/editors/armature/editarmature.c @@ -334,7 +334,7 @@ void ED_armature_from_edit(Object *obedit) memcpy(newBone->head, eBone->head, sizeof(float)*3); memcpy(newBone->tail, eBone->tail, sizeof(float)*3); newBone->flag= eBone->flag; - + if (eBone == arm->act_edbone) { newBone->flag |= BONE_SELECTED; /* important, editbones can be active with only 1 point selected */ arm->act_edbone= NULL; @@ -353,7 +353,7 @@ void ED_armature_from_edit(Object *obedit) newBone->rad_tail= eBone->rad_tail; newBone->segments= eBone->segments; newBone->layer = eBone->layer; - + if(eBone->prop) newBone->prop= IDP_CopyProperty(eBone->prop); } @@ -620,8 +620,9 @@ static int apply_armature_pose2bones_exec (bContext *C, wmOperator *op) curbone->flag |= BONE_UNKEYED; } - /* convert editbones back to bones */ + /* convert editbones back to bones, and then free the edit-data */ ED_armature_from_edit(ob); + ED_armature_edit_free(ob); /* flush positions of posebones */ where_is_pose(scene, ob); |