[Bf-blender-cvs] [b3005bf6881] master: Fix T85981, part II: bone's custom shape disappear on undo in some cases.

Bastien Montagne noreply at git.blender.org
Tue Mar 2 12:41:04 CET 2021


Commit: b3005bf6881f37fb4ed34c3f3b2db4cf4530814e
Author: Bastien Montagne
Date:   Tue Mar 2 12:37:44 2021 +0100
Branches: master
https://developer.blender.org/rBb3005bf6881f37fb4ed34c3f3b2db4cf4530814e

Fix T85981, part II: bone's custom shape disappear on undo in some cases.

Nicely hidden bug in pose read library code, it was using the library
from the wrong ID as reference to relink the custom shape object pointer
(pose is data from Object, not Armature).

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

M	source/blender/blenkernel/intern/action.c

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

diff --git a/source/blender/blenkernel/intern/action.c b/source/blender/blenkernel/intern/action.c
index 06b8bd5f0f2..f9c2a4e53ad 100644
--- a/source/blender/blenkernel/intern/action.c
+++ b/source/blender/blenkernel/intern/action.c
@@ -2002,7 +2002,7 @@ void BKE_pose_blend_read_lib(BlendLibReader *reader, Object *ob, bPose *pose)
 
     IDP_BlendReadLib(reader, pchan->prop);
 
-    BLO_read_id_address(reader, arm->id.lib, &pchan->custom);
+    BLO_read_id_address(reader, ob->id.lib, &pchan->custom);
     if (UNLIKELY(pchan->bone == NULL)) {
       rebuild = true;
     }



More information about the Bf-blender-cvs mailing list