archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix handling of B-Bone custom handle references in Edit mode undo.

Browse Source 
Correct a couple of places that should process the handle pointers.
This commit is contained in:
Alexander Gavrilov
2018-11-19 20:34:25 +03:00
parent 7bb512594c
commit 0ff05daee0
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/editors/armature/armature_relations.c
View File

@@ -549,8 +549,15 @@ static void separate_armature_bones(Main *bmain, Object *ob, short sel)
/* clear the pchan->parent var of any pchan that had this as its parent */ /* clear the pchan->parent var of any pchan that had this as its parent */
for (pchn = ob->pose->chanbase.first; pchn; pchn = pchn->next) { for (pchn = ob->pose->chanbase.first; pchn; pchn = pchn->next) {
if (pchn->parent == pchan) if (pchn->parent == pchan) {
pchn->parent = NULL; pchn->parent = NULL;
}
if (pchn->bbone_next == pchan) {
pchn->bbone_next = NULL;
}
if (pchn->bbone_prev == pchan) {
pchn->bbone_prev = NULL;
}
} }
/* free any of the extra-data this pchan might have */ /* free any of the extra-data this pchan might have */

6
source/blender/editors/armature/armature_utils.c
View File

@@ -816,6 +816,12 @@ void ED_armature_ebone_listbase_copy(ListBase *lb_dst, ListBase *lb_src)
if (ebone_dst->parent) { if (ebone_dst->parent) {
ebone_dst->parent = ebone_dst->parent->temp.ebone; ebone_dst->parent = ebone_dst->parent->temp.ebone;
} }
if (ebone_dst->bbone_next) {
ebone_dst->bbone_next = ebone_dst->bbone_next->temp.ebone;
}
if (ebone_dst->bbone_prev) {
ebone_dst->bbone_prev = ebone_dst->bbone_prev->temp.ebone;
}
} }
} }