diff options
Diffstat (limited to 'source/blender/editors/space_node/drawnode.c')
| -rw-r--r-- | source/blender/editors/space_node/drawnode.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c index faf6fa8cdd8..25693009bf2 100644 --- a/source/blender/editors/space_node/drawnode.c +++ b/source/blender/editors/space_node/drawnode.c @@ -95,8 +95,6 @@ #include "node_intern.h" -extern void autocomplete_uv(char *str, void *arg_v); -// XXX extern int verify_valid_uv_name(char *str); /* autocomplete callback for buttons */ static void autocomplete_vcol(bContext *C, char *str, void *arg_v) @@ -572,9 +570,11 @@ static int node_shader_buts_material(uiBlock *block, bNodeTree *ntree, bNode *no if(butr->ymax-butr->ymin > 21.0f) dy+= 19; uiBlockBeginAlign(block); + /* XXX if(node->id==NULL) uiBlockSetCol(block, TH_REDALERT); else if(has_us) uiBlockSetCol(block, TH_BUT_SETTING1); else uiBlockSetCol(block, TH_BUT_SETTING2); + */ /* browse button */ IDnames_to_pupstring(&strp, NULL, "ADD NEW %x32767", &(G.main->mat), NULL, NULL); @@ -591,7 +591,6 @@ static int node_shader_buts_material(uiBlock *block, bNodeTree *ntree, bNode *no butr->xmin+19, dy, (short)(butr->xmax-butr->xmin-19.0f), 19, NULL, 0.0, 0.0, 0, 0, "Add new Material"); uiButSetFunc(bt, node_new_mat_cb, ntree, node); - uiBlockSetCol(block, TH_AUTO); } else { /* name button */ @@ -614,7 +613,6 @@ static int node_shader_buts_material(uiBlock *block, bNodeTree *ntree, bNode *no /* WATCH IT: we use this callback in material buttons, but then only want first row */ if(butr->ymax-butr->ymin > 21.0f) { /* node options */ - uiBlockSetCol(block, TH_AUTO); uiDefButBitS(block, TOG, SH_NODE_MAT_DIFF, B_NODE_EXEC, "Diff", butr->xmin, butr->ymin, dx, 19, &node->custom1, 0, 0, 0, 0, "Material Node outputs Diffuse"); @@ -700,14 +698,12 @@ static int node_shader_buts_geometry(uiBlock *block, bNodeTree *ntree, bNode *no // XXX if(!verify_valid_uv_name(ngeo->uvname)) // XXX uiBlockSetCol(block, TH_REDALERT); but= uiDefBut(block, TEX, B_NODE_EXEC, "UV:", butr->xmin, butr->ymin+20, butr->xmax-butr->xmin, 20, ngeo->uvname, 0, 31, 0, 0, "Set name of UV layer to use, default is active UV layer"); - // uiButSetCompleteFunc(but, autocomplete_uv, NULL); - uiBlockSetCol(block, TH_AUTO); + // XXX uiButSetCompleteFunc(but, autocomplete_uv, NULL); - if(!verify_valid_vcol_name(ngeo->colname)) - uiBlockSetCol(block, TH_REDALERT); + if(!verify_valid_vcol_name(ngeo->colname)); +// uiBlockSetCol(block, TH_REDALERT); but= uiDefBut(block, TEX, B_NODE_EXEC, "Col:", butr->xmin, butr->ymin, butr->xmax-butr->xmin, 20, ngeo->colname, 0, 31, 0, 0, "Set name of vertex color layer to use, default is active vertex color layer"); uiButSetCompleteFunc(but, autocomplete_vcol, NULL); - uiBlockSetCol(block, TH_AUTO); } return 40; @@ -895,7 +891,6 @@ static int node_composit_buts_image(uiBlock *block, bNodeTree *ntree, bNode *nod char *strp; uiBlockBeginAlign(block); - uiBlockSetCol(block, TH_BUT_SETTING2); /* browse button */ IMAnames_to_pupstring(&strp, NULL, "LOAD NEW %x32767", &(G.main->image), NULL, NULL); @@ -912,7 +907,6 @@ static int node_composit_buts_image(uiBlock *block, bNodeTree *ntree, bNode *nod butr->xmin+19, dy, (short)(butr->xmax-butr->xmin-19.0f), 19, NULL, 0.0, 0.0, 0, 0, "Add new Image"); uiButSetFunc(bt, node_active_cb, ntree, node); - uiBlockSetCol(block, TH_AUTO); } else { /* name button + type */ @@ -2266,7 +2260,6 @@ static int node_texture_buts_image(uiBlock *block, bNodeTree *ntree, bNode *node if( block ) { uiBlockBeginAlign(block); - uiBlockSetCol(block, TH_BUT_SETTING2); /* browse button */ IMAnames_to_pupstring(&strp, NULL, "LOAD NEW %x32767", &(G.main->image), NULL, NULL); @@ -2283,7 +2276,6 @@ static int node_texture_buts_image(uiBlock *block, bNodeTree *ntree, bNode *node butr->xmin+19, butr->ymin, (short)(butr->xmax-butr->xmin-19.0f), 19, NULL, 0.0, 0.0, 0, 0, "Add new Image"); uiButSetFunc(bt, node_active_cb, ntree, node); - uiBlockSetCol(block, TH_AUTO); } else { /* name button */ |