diff options
| author | Sergey Sharybin <sergey@blender.org> | 2020-08-04 13:08:09 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey@blender.org> | 2020-08-04 13:08:09 +0300 |
| commit | 778f0aca5263f9fd37ef1f7a1162af0328630cf8 (patch) | |
| tree | 7a8ac9bc98b1c3986db73ebb7e8e7e4560536d02 /source/blender/editors/armature | |
| parent | 03c2439d96e8f366646bf20095514c057593aa24 (diff) | |
| parent | 8d3b8bc83589eccee10fcc0da4233b3adcf0cdde (diff) | |
Merge branch 'blender-v2.90-release'
Diffstat (limited to 'source/blender/editors/armature')
| -rw-r--r-- | source/blender/editors/armature/armature_relations.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/editors/armature/armature_relations.c b/source/blender/editors/armature/armature_relations.c index 0dd35fb9fdc..a737916e9a2 100644 --- a/source/blender/editors/armature/armature_relations.c +++ b/source/blender/editors/armature/armature_relations.c @@ -384,6 +384,7 @@ int ED_armature_join_objects_exec(bContext *C, wmOperator *op) BLI_remlink(curarm->edbo, curbone); BLI_addtail(arm->edbo, curbone); + /* Pose channel is moved from one storage to another, its UUID is still unique. */ BLI_remlink(&opose->chanbase, pchan); BLI_addtail(&pose->chanbase, pchan); BKE_pose_channels_hash_free(opose); |