diff options
| author | Matt Ebb <matt@mke3.net> | 2009-02-18 08:54:37 +0300 |
|---|---|---|
| committer | Matt Ebb <matt@mke3.net> | 2009-02-18 08:54:37 +0300 |
| commit | f5de61816bb7a790b8f60f82ddd0a777b23f1413 (patch) | |
| tree | 21a8662bb4a5e18ea9e07a18d7b636ad3ee8113d /source/blender/editors/space_node | |
| parent | ba59754a1d76da576dd43a347fc4e6c2e6598a60 (diff) | |
* Cleaned up naming of icon ID constants. This helps fix bad icons in the graph editor among others.
Diffstat (limited to 'source/blender/editors/space_node')
| -rw-r--r-- | source/blender/editors/space_node/drawnode.c | 6 | ||||
| -rw-r--r-- | source/blender/editors/space_node/node_draw.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_node/node_header.c | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c index 841600d7262..bf96d1c38aa 100644 --- a/source/blender/editors/space_node/drawnode.c +++ b/source/blender/editors/space_node/drawnode.c @@ -852,7 +852,7 @@ static char *node_image_type_pup(void) str[0]= 0; a= sprintf(str, "Image Type %%t|"); - a+= sprintf(str+a, " Image %%x%d %%i%d|", IMA_SRC_FILE, ICON_IMAGE_DEHLT); + a+= sprintf(str+a, " Image %%x%d %%i%d|", IMA_SRC_FILE, ICON_IMAGE_DATA); a+= sprintf(str+a, " Movie %%x%d %%i%d|", IMA_SRC_MOVIE, ICON_SEQUENCE); a+= sprintf(str+a, " Sequence %%x%d %%i%d|", IMA_SRC_SEQUENCE, ICON_IMAGE_COL); a+= sprintf(str+a, " Generated %%x%d %%i%d", IMA_SRC_GENERATED, ICON_BLANK1); @@ -920,7 +920,7 @@ static int node_composit_buts_image(uiBlock *block, bNodeTree *ntree, bNode *nod Image *ima= (Image *)node->id; short xmin= (short)butr->xmin, xmax= (short)butr->xmax; short width= xmax - xmin - 45; - short icon= ICON_IMAGE_DEHLT; + short icon= ICON_IMAGE_DATA; if(ima->source==IMA_SRC_MOVIE) icon= ICON_SEQUENCE; else if(ima->source==IMA_SRC_SEQUENCE) icon= ICON_IMAGE_COL; @@ -1086,7 +1086,7 @@ static int node_composit_buts_renderlayers(uiBlock *block, bNodeTree *ntree, bNo /* browse button layer */ strp= scene_layer_menu(node->id?(Scene *)node->id:scene); if(node->id) - bt= uiDefIconTextButS(block, MENU, B_NODE_EXEC, ICON_SCENE_DEHLT, strp, + bt= uiDefIconTextButS(block, MENU, B_NODE_EXEC, ICON_SCENE_DATA, strp, butr->xmin+20, butr->ymin, (butr->xmax-butr->xmin)-40, 19, &node->custom1, 0, 0, 0, 0, "Choose Render Layer"); else diff --git a/source/blender/editors/space_node/node_draw.c b/source/blender/editors/space_node/node_draw.c index 8c9d2d12c86..28deb705b7b 100644 --- a/source/blender/editors/space_node/node_draw.c +++ b/source/blender/editors/space_node/node_draw.c @@ -674,7 +674,7 @@ static void node_draw_basis(const bContext *C, ARegion *ar, SpaceNode *snode, bN if(node->flag & (NODE_ACTIVE_ID|NODE_DO_OUTPUT)) icon_id= ICON_MATERIAL; else - icon_id= ICON_MATERIAL_DEHLT; + icon_id= ICON_MATERIAL_DATA; iconofs-= 18.0f; glEnable(GL_BLEND); UI_icon_draw_aspect_blended(iconofs, rct->ymax-NODE_DY+2, icon_id, snode->aspect, -60); diff --git a/source/blender/editors/space_node/node_header.c b/source/blender/editors/space_node/node_header.c index e8f39a94c76..d2e7df55e54 100644 --- a/source/blender/editors/space_node/node_header.c +++ b/source/blender/editors/space_node/node_header.c @@ -732,13 +732,13 @@ void node_header_buttons(const bContext *C, ARegion *ar) /* main type choosing */ uiBlockBeginAlign(block); - uiDefIconButI(block, ROW, B_REDR, ICON_MATERIAL_DEHLT, xco,yco,XIC,YIC-2, + uiDefIconButI(block, ROW, B_REDR, ICON_MATERIAL_DATA, xco,yco,XIC,YIC-2, &(snode->treetype), 2.0f, 0.0f, 0.0f, 0.0f, "Material Nodes"); xco+= XIC; - uiDefIconButI(block, ROW, B_REDR, ICON_IMAGE_DEHLT, xco,yco,XIC,YIC-2, + uiDefIconButI(block, ROW, B_REDR, ICON_IMAGE_DATA, xco,yco,XIC,YIC-2, &(snode->treetype), 2.0f, 1.0f, 0.0f, 0.0f, "Composite Nodes"); xco+= XIC; - uiDefIconButI(block, ROW, B_REDR, ICON_TEXTURE_DEHLT, xco,yco,XIC,YIC-2, + uiDefIconButI(block, ROW, B_REDR, ICON_TEXTURE_DATA, xco,yco,XIC,YIC-2, &(snode->treetype), 2.0f, 2.0f, 0.0f, 0.0f, "Texture Nodes"); xco+= 2*XIC; uiBlockEndAlign(block); |