diff options
author | Joshua Leung <aligorith@gmail.com> | 2007-05-25 15:48:27 +0400 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2007-05-25 15:48:27 +0400 |
commit | a21f8292d9aeff54153fc65560d56b3d4f33575a (patch) | |
tree | 150561ce55d11822cc8b65ca6c8d3de2ad8f98d9 /source/blender | |
parent | 810867b6d8d68bc6205dd5d00faf43c456c4be4f (diff) |
Bugfix #6735:
Removed the error that showed up when trying to paste a pose onto protected proxy bones. By definition, you shouldn't be able to keyframe/pose protected proxy bones, but nothing obeys that currently.
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/src/poseobject.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/src/poseobject.c b/source/blender/src/poseobject.c index d51573d6cf8..0b78601ab9b 100644 --- a/source/blender/src/poseobject.c +++ b/source/blender/src/poseobject.c @@ -674,8 +674,11 @@ void paste_posebuf (int flip) return; } + /* + // disabled until protected bones in proxies follow the rules everywhere else! if(pose_has_protected_selected(ob, 1)) return; + */ /* Safely merge all of the channels in this pose into any existing pose */ |