Revision: 44059
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44059
Author: nazgul
Date: 2012-02-12 12:07:02 +0000 (Sun, 12 Feb 2012)
Log Message:
-----------
Fix #30110: Outliner view: restriction icons not updating when toggling from
Groups view
Fixed by using proper button type.
Modified Paths:
--------------
trunk/blender/source/blender/editors/space_outliner/outliner_draw.c
Modified: trunk/blender/source/blender/editors/space_outliner/outliner_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_outliner/outliner_draw.c
2012-02-12 11:58:41 UTC (rev 44058)
+++ trunk/blender/source/blender/editors/space_outliner/outliner_draw.c
2012-02-12 12:07:02 UTC (rev 44059)
@@ -441,15 +441,15 @@
uiBlockSetEmboss(block, UI_EMBOSSN);
restrict_bool= group_restrict_flag(gr,
OB_RESTRICT_VIEW);
- bt = uiDefIconBut(block, BUT, 0, restrict_bool
? ICON_RESTRICT_VIEW_ON : ICON_RESTRICT_VIEW_OFF,
(int)ar->v2d.cur.xmax-OL_TOG_RESTRICT_VIEWX, (int)te->ys, UI_UNIT_X-1,
UI_UNIT_Y-1, NULL, 0, 0, 0, 0, "Restrict/Allow visibility in the 3D View");
+ bt = uiDefIconBut(block, ICONTOG, 0,
restrict_bool ? ICON_RESTRICT_VIEW_ON : ICON_RESTRICT_VIEW_OFF,
(int)ar->v2d.cur.xmax-OL_TOG_RESTRICT_VIEWX, (int)te->ys, UI_UNIT_X-1,
UI_UNIT_Y-1, NULL, 0, 0, 0, 0, "Restrict/Allow visibility in the 3D View");
uiButSetFunc(bt,
restrictbutton_gr_restrict_view, scene, gr);
restrict_bool= group_restrict_flag(gr,
OB_RESTRICT_SELECT);
- bt = uiDefIconBut(block, BUT, 0, restrict_bool
? ICON_RESTRICT_SELECT_ON : ICON_RESTRICT_SELECT_OFF,
(int)ar->v2d.cur.xmax-OL_TOG_RESTRICT_SELECTX, (int)te->ys, UI_UNIT_X-1,
UI_UNIT_Y-1, NULL, 0, 0, 0, 0, "Restrict/Allow selection in the 3D View");
+ bt = uiDefIconBut(block, ICONTOG, 0,
restrict_bool ? ICON_RESTRICT_SELECT_ON : ICON_RESTRICT_SELECT_OFF,
(int)ar->v2d.cur.xmax-OL_TOG_RESTRICT_SELECTX, (int)te->ys, UI_UNIT_X-1,
UI_UNIT_Y-1, NULL, 0, 0, 0, 0, "Restrict/Allow selection in the 3D View");
uiButSetFunc(bt,
restrictbutton_gr_restrict_select, scene, gr);
restrict_bool= group_restrict_flag(gr,
OB_RESTRICT_RENDER);
- bt = uiDefIconBut(block, BUT, 0, restrict_bool
? ICON_RESTRICT_RENDER_ON : ICON_RESTRICT_RENDER_OFF,
(int)ar->v2d.cur.xmax-OL_TOG_RESTRICT_RENDERX, (int)te->ys, UI_UNIT_X-1,
UI_UNIT_Y-1, NULL, 0, 0, 0, 0, "Restrict/Allow renderability");
+ bt = uiDefIconBut(block, ICONTOG, 0,
restrict_bool ? ICON_RESTRICT_RENDER_ON : ICON_RESTRICT_RENDER_OFF,
(int)ar->v2d.cur.xmax-OL_TOG_RESTRICT_RENDERX, (int)te->ys, UI_UNIT_X-1,
UI_UNIT_Y-1, NULL, 0, 0, 0, 0, "Restrict/Allow renderability");
uiButSetFunc(bt,
restrictbutton_gr_restrict_render, scene, gr);
uiBlockSetEmboss(block, UI_EMBOSS);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
