diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-16 18:23:52 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-16 18:25:20 +0300 |
| commit | 48645e55e1af069e0e7c2a5029a732be334c1dbd (patch) | |
| tree | fd606fe24e9c4c4c91c1e3ebc9158479385c43e7 /source/blender/blenkernel | |
| parent | 34c98e3d415318bc8a804a1ef08649b6dee96398 (diff) | |
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.
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/intern/armature.c | 3 |
1 files changed, 2 insertions, 1 deletions
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); } |