* 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.

1 files changed, 15 insertions, 1 deletions

diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index 78908a33faa..e336699bd65 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -193,7 +193,9 @@ typedef struct Object {
 	struct Group *dup_group;	/* object duplicator for group */
 	
 	short fluidsimFlag;			/* NT toggle fluidsim participation on/off */
-	short pad3;
+	
+	short restrictflag;			/* for restricting view, select, render etc. accessible in outliner */
+
 	short shapenr, shapeflag;	/* current shape key for menu or pinned, flag for pinning */
 	float smoothresh;			/* smoothresh is phong interpolation ray_shadow correction in render */
 	int pad4;
@@ -333,6 +335,8 @@ extern Object workob;
 #define OB_BOUND_POLYH		4
 #define OB_BOUND_POLYT		5
 
+/* **************** BASE ********************* */
+
 /* also needed for base!!!!! or rather, thy interfere....*/
 /* base->flag and ob->flag */
 #define BA_WAS_SEL			2
@@ -343,6 +347,11 @@ extern Object workob;
 
 #define BA_FROMSET			128
 
+/* an initial attempt as making selection more specific! */
+#define BA_DESELECT	0
+#define BA_SELECT		1
+
+
 #define OB_FROMDUPLI		512
 #define OB_DONE				1024
 #define OB_RADIO			2048
@@ -393,6 +402,11 @@ extern Object workob;
 #define OB_ADDACT		1024
 #define OB_SHOWCONT		2048
 
+/* ob->restrictflag */
+#define OB_RESTRICT_VIEW	1
+#define OB_RESTRICT_SELECT	2
+#define OB_RESTRICT_RENDER	4
+
 /* ob->shapeflag */
 #define OB_SHAPE_LOCK		1
 #define OB_SHAPE_TEMPLOCK	2