* Added the ability to toggle visibility/renderability for modifiers, from the outliner

1 files changed, 38 insertions, 0 deletions

diff --git a/source/blender/src/outliner.c b/source/blender/src/outliner.c
index 683b06aafc4..fcab7977aa9 100644
--- a/source/blender/src/outliner.c
+++ b/source/blender/src/outliner.c
@@ -68,6 +68,7 @@
 #include "BKE_main.h"
 #include "BKE_material.h"
 #include "BKE_modifier.h"
+#include "BKE_object.h"
 #include "BKE_screen.h"
 #include "BKE_scene.h"
 #include "BKE_utildefines.h"
@@ -698,6 +699,7 @@ static TreeElement *outliner_add_element(SpaceOops *soops, ListBase *lb, void *i
 					for (index=0,md=ob->modifiers.first; md; index++,md=md->next) {
 						TreeElement *te = outliner_add_element(soops, &temod->subtree, ob, temod, TSE_MODIFIER, index);
 						te->name= md->name;
+						te->directdata = md;
 
 						if (md->type==eModifierType_Lattice) {
 							outliner_add_element(soops, &te->subtree, ((LatticeModifierData*) md)->object, te, TSE_LINKED_OB, 0);
@@ -3523,6 +3525,20 @@ static void restrictbutton_r_lay_cb(void *poin, void *poin2)
 	allqueue(REDRAWBUTSSCENE, 0);
 }
 
+static void restrictbutton_modifier_cb(void *poin, void *poin2)
+{
+	Object *ob = (Object *)poin;
+	
+	DAG_object_flush_update(G.scene, ob, OB_RECALC_DATA);
+	object_handle_update(ob);
+	countall();
+
+	allqueue(REDRAWOOPS, 0);
+	allqueue(REDRAWVIEW3D, 0);
+	allqueue(REDRAWBUTSEDIT, 0);
+	allqueue(REDRAWBUTSOBJECT, 0);
+}
+
 static void namebutton_cb(void *tep, void *oldnamep)
 {
 	SpaceOops *soops= curarea->spacedata.first;
@@ -3685,6 +3701,28 @@ static void outliner_draw_restrictbuts(uiBlock *block, SpaceOops *soops, ListBas
 				
 				uiBlockSetEmboss(block, UI_EMBOSS);
 			}
+			else if(tselem->type==TSE_MODIFIER)  {
+				ModifierData *md= (ModifierData *)te->directdata;
+				ob = (Object *)tselem->id;
+				
+				uiBlockSetEmboss(block, UI_EMBOSSN);
+				bt= uiDefIconButBitI(block, ICONTOGN, eModifierMode_Realtime, REDRAWALL, ICON_RESTRICT_VIEW_OFF, 
+						(int)soops->v2d.cur.xmax-OL_TOG_RESTRICT_VIEWX, te->ys, 17, OL_H-1, &(md->mode), 0, 0, 0, 0, "Restrict/Allow visibility in the 3D View");
+				uiButSetFunc(bt, restrictbutton_modifier_cb, ob, NULL);
+				uiButSetFlag(bt, UI_NO_HILITE);
+				
+				/*
+				bt= uiDefIconButBitI(block, ICONTOGN, eModifierMode_Editmode, REDRAWALL, VICON_EDIT, 
+						(int)soops->v2d.cur.xmax-OL_TOG_RESTRICT_SELECTX, te->ys, 17, OL_H-1, &(md->mode), 0, 0, 0, 0, "Restrict/Allow selection in the 3D View");
+				uiButSetFunc(bt, restrictbutton_modifier_cb, ob, NULL);
+				uiButSetFlag(bt, UI_NO_HILITE);
+				*/
+				
+				bt= uiDefIconButBitI(block, ICONTOGN, eModifierMode_Render, REDRAWALL, ICON_RESTRICT_RENDER_OFF, 
+						(int)soops->v2d.cur.xmax-OL_TOG_RESTRICT_RENDERX, te->ys, 17, OL_H-1, &(md->mode), 0, 0, 0, 0, "Restrict/Allow renderability");
+				uiButSetFunc(bt, restrictbutton_modifier_cb, ob, NULL);
+				uiButSetFlag(bt, UI_NO_HILITE);
+			}
 		}
 		
 		if((tselem->flag & TSE_CLOSED)==0) outliner_draw_restrictbuts(block, soops, &te->subtree);