[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36476] branches/particles-2010/source/ blender/editors/space_node/node_draw.c: Disabled the quick viewer output selection buttons.
Lukas Toenne
lukas.toenne at googlemail.com
Wed May 4 08:24:34 CEST 2011
Revision: 36476
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36476
Author: lukastoenne
Date: 2011-05-04 06:24:33 +0000 (Wed, 04 May 2011)
Log Message:
-----------
Disabled the quick viewer output selection buttons. These are supposed to replace viewer nodes in future, but are not implemented for compo/material/texture trees yet.
Modified Paths:
--------------
branches/particles-2010/source/blender/editors/space_node/node_draw.c
Modified: branches/particles-2010/source/blender/editors/space_node/node_draw.c
===================================================================
--- branches/particles-2010/source/blender/editors/space_node/node_draw.c 2011-05-04 06:08:14 UTC (rev 36475)
+++ branches/particles-2010/source/blender/editors/space_node/node_draw.c 2011-05-04 06:24:33 UTC (rev 36476)
@@ -663,15 +663,6 @@
uiDefBut(node->block, LABEL, 0, showname, (short)(rct->xmin+15), (short)(rct->ymax-NODE_DY),
(int)(iconofs - rct->xmin-18.0f), NODE_DY, NULL, 0, 0, 0, 0, "");
- #if 0
- {
- char str[64];
- sprintf(str, "[%d]", node->level);
- uiDefBut(node->block, LABEL, 0, str,
- (short)(rct->xmin+100), (short)(rct->ymax-NODE_DY), 40, NODE_DY, NULL, 0, 0, 0, 0, "");
- }
- #endif
-
/* body */
UI_ThemeColor4(TH_NODE);
glEnable(GL_BLEND);
@@ -779,11 +770,13 @@
node_socket_circle_draw(ntree, sock, NODE_SOCKSIZE);
+ #if 0 /* XXX viewer output buttons: these could replace viewer nodes, disabled for now */
/* button for viewer output flag */
if (sock->flag & SOCK_VIEW_OUTPUT)
uiDefIconButR(node->block, TOG, 0, ICON_RESTRICT_VIEW_OFF, sock->locx-22, sock->locy-8, 16, 16, &sockptr, "view", 0, 0, 0, 0, 0, "");
else
uiDefIconButR(node->block, TOG, 0, ICON_RESTRICT_VIEW_ON, sock->locx-22, sock->locy-8, 16, 16, &sockptr, "view", 0, 0, 0, 0, 0, "");
+ #endif
ofs= 0;
UI_ThemeColor(TH_TEXT);
@@ -792,7 +785,7 @@
ofs++;
slen= snode->aspect*UI_GetStringWidth(sock->name+ofs);
}
- uiDefBut(node->block, LABEL, 0, sock->name+ofs, (short)(sock->locx-35.0f-slen), (short)(sock->locy-9.0f),
+ uiDefBut(node->block, LABEL, 0, sock->name+ofs, (short)(sock->locx-15.0f-slen), (short)(sock->locy-9.0f),
(short)(node->width-NODE_DY), NODE_DY, NULL, 0, 0, 0, 0, "");
}
More information about the Bf-blender-cvs
mailing list