diff options
author | Matt Ebb <matt@mke3.net> | 2006-11-20 08:12:58 +0300 |
---|---|---|
committer | Matt Ebb <matt@mke3.net> | 2006-11-20 08:12:58 +0300 |
commit | 5428f2eb6c33b970d66f06dc5b08bc70bf98f3fb (patch) | |
tree | e17b31c8327f34fa463816a15dc286345b1c75c7 /source/blender/src/interface_draw.c | |
parent | e435fbc3c5a00e5b63c1cd2609ab6828187660d3 (diff) |
* Object level restrictions in outliner
This adds the ability to restrict an individual object from:
- being visible in the 3D View
- being selectable in the 3D View
- being renderable
with 3 columns of buttons in the outliner.
These restrictions are further down the hierarchy than layers, so for example if an object is in an invisible layer, it will be invisible regardless of whether the object's own visibility setting is on or off. This works on a different conceptual level than layers, being better for more quick interaction (like temporarily making a mesh unselectable while you're posing its armature), rather than so much for scene organisation.
The 3 columns of icons can be turned off in the Outliner View menu.
Along with this is some small cleaning up in interface_icons.c and outliner.c.
Diffstat (limited to 'source/blender/src/interface_draw.c')
-rw-r--r-- | source/blender/src/interface_draw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/src/interface_draw.c b/source/blender/src/interface_draw.c index b91a8f83b64..84ae130110a 100644 --- a/source/blender/src/interface_draw.c +++ b/source/blender/src/interface_draw.c @@ -207,7 +207,7 @@ static void ui_draw_icon(uiBut *but, BIFIconID icon) glEnable(GL_BLEND); /* calculate blend color */ - if ELEM4(but->type, ICONTOG, TOG, ROW, TOGN) { + if ELEM3(but->type, TOG, ROW, TOGN) { if(but->flag & UI_SELECT); else if(but->flag & UI_ACTIVE); else blend= -60; |