Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <bastien@blender.org>2020-10-26 11:52:37 +0300
committerBastien Montagne <bastien@blender.org>2020-10-26 11:52:37 +0300
commit2c024bd335fef04cd7e49bdf39aee0d7b8241745 (patch)
treea040368a93da74ecd8850e16747937181a38a089
parentcd16a5cea867b08741445f1c5a4444ebfd0dfc38 (diff)
parent4b7abde11df9bd6ed759a28286ce3a05147e08c8 (diff)
Merge branch 'blender-v2.91-release' into master
-rw-r--r--source/blender/blenkernel/intern/lib_override.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/lib_override.c b/source/blender/blenkernel/intern/lib_override.c
index 3bac0cf6289..6574a15fd59 100644
--- a/source/blender/blenkernel/intern/lib_override.c
+++ b/source/blender/blenkernel/intern/lib_override.c
@@ -1357,10 +1357,15 @@ bool BKE_lib_override_library_operations_create(Main *bmain, ID *local)
* ensure this is valid, but in some situations (like hidden collections etc.) this won't
* be the case, so we need to take care of this ourselves. */
Object *ob_local = (Object *)local;
+ Object *ob_reference = (Object *)local->override_library->reference;
if (ob_local->data != NULL && ob_local->type == OB_ARMATURE && ob_local->pose != NULL &&
ob_local->pose->flag & POSE_RECALC) {
BKE_pose_rebuild(bmain, ob_local, ob_local->data, true);
}
+ if (ob_reference->data != NULL && ob_reference->type == OB_ARMATURE &&
+ ob_reference->pose != NULL && ob_reference->pose->flag & POSE_RECALC) {
+ BKE_pose_rebuild(bmain, ob_reference, ob_reference->data, true);
+ }
}
PointerRNA rnaptr_local, rnaptr_reference;