blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 746 Projects 19 Wiki Activity

Outliner: Toggle restrict buttons only for selectable child objects 

D404 by @rupp with minor edits by me.
This commit is contained in:
Julian Eisel 2015-02-14 21:54:31 +01:00
parent 354cf76803
commit 24976dd29d
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source/blender/editors/space_outliner/outliner_draw.c
View File

@ -176,16 +176,20 @@ static void restrictbutton_recursive_child(bContext *C, Scene *scene, Object *ob
{
Main *bmain = CTX_data_main(C);
Object *ob;
for (ob = bmain->object.first; ob; ob = ob->id.next) {
if (BKE_object_is_child_recursive(ob_parent, ob)) {
if (state) {
ob->restrictflag |= flag;
if (deselect) {
ED_base_object_select(BKE_scene_base_find(scene, ob), BA_DESELECT);
/* only do if child object is selectable */
if ((flag == OB_RESTRICT_SELECT) || (ob->restrictflag & OB_RESTRICT_SELECT) == 0) {
if (state) {
ob->restrictflag |= flag;
if (deselect) {
ED_base_object_select(BKE_scene_base_find(scene, ob), BA_DESELECT);
}
}
else {
ob->restrictflag &= ~flag;
}
}
else {
ob->restrictflag &= ~flag;
}
if (rnapropname) {