[Bf-blender-cvs] [48645e55e1a] blender2.8: Fix again bloody locked proxy bones...

Bastien Montagne noreply at git.blender.org
Wed May 16 17:27:04 CEST 2018


Commit: 48645e55e1af069e0e7c2a5029a732be334c1dbd
Author: Bastien Montagne
Date:   Wed May 16 17:23:52 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB48645e55e1af069e0e7c2a5029a732be334c1dbd

Fix again bloody locked proxy bones...

No idea why that was working this morning, now we do not get CoW tag
anymore (which kind of makes sense since it's set *after* copying
happens...), so just resorting to using the NO_MAIN flag instead.

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

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

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

diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c
index f409cdc3a74..f80096b39eb 100644
--- a/source/blender/blenkernel/intern/armature.c
+++ b/source/blender/blenkernel/intern/armature.c
@@ -1993,7 +1993,8 @@ void BKE_pose_rebuild(Object *ob, bArmature *arm)
 	/* synchronize protected layers with proxy */
 	/* HACK! To preserve 2.7x behavior that you always can pose even locked bones,
 	 * do not do any restauration if this is a COW temp copy! */
-	if (ob->proxy != NULL && (ob->id.tag & LIB_TAG_COPY_ON_WRITE) == 0) {
+	/* Switched back to just NO_MAIN tag, for some reasons (c) using COW tag was working this morning, but not anymore... */
+	if (ob->proxy != NULL && (ob->id.tag & LIB_TAG_NO_MAIN) == 0) {
 		BKE_object_copy_proxy_drivers(ob, ob->proxy);
 		pose_proxy_synchronize(ob, ob->proxy, arm->layer_protected);
 	}



More information about the Bf-blender-cvs mailing list