diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-01-12 20:08:28 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-01-12 20:08:28 +0300 |
| commit | f7f98f3b05d166b7047ca54eb54b36a92e675a88 (patch) | |
| tree | cb72dcc44cf14289ad62cb744a17bbba9a0d8113 /source/blender/editors | |
| parent | b8d743c9c6bcbd908c4cd0a3f161b6d08de41847 (diff) | |
Proxy Protection Fixes
* Mostly revert #24880: Transform Locks affecting animation system. This
was implemented as a feature request from Nathan but was not the
intended functionality, and actually gives problems instead. The transform
locks should really only affect what the user can do, not if the property
can be animated internally.
* Revert #25868: fix for lib linked scenes not animating. This was needed
due to the above feature, but meant that all lib linked properties were
editable in the UI.
* Make bone properties of on proxy-protected layers not editable. They will
be overriden on reload/redo like lib linked data, so should not be edited.
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/transform/transform_conversions.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index 7a89765fef2..5484e3cd8bf 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -714,7 +714,7 @@ int count_set_pose_transflags(int *out_mode, short around, Object *ob) for(pchan = ob->pose->chanbase.first; pchan; pchan = pchan->next) { bone = pchan->bone; if(bone->layer & arm->layer) { - if(bone->flag & BONE_SELECTED) + if((bone->flag & BONE_SELECTED) && !(ob->proxy && pchan->bone->layer & arm->layer_protected)) bone->flag |= BONE_TRANSFORM; else bone->flag &= ~BONE_TRANSFORM; |