From c1e901811811f10c90789784667ed9c0f708010f Mon Sep 17 00:00:00 2001
From: Robert Holcomb <bob_holcomb@hotmail.com>
Date: Sun, 25 Mar 2007 23:54:39 +0000
Subject: All UI code reverted to drawnode.c

---
 source/blender/nodes/intern/SHD_nodes/SHD_camera.c |   4 +-
 source/blender/nodes/intern/SHD_nodes/SHD_curves.c |   8 +-
 source/blender/nodes/intern/SHD_nodes/SHD_geom.c   |  16 +--
 .../blender/nodes/intern/SHD_nodes/SHD_mapping.c   |  52 +-------
 .../blender/nodes/intern/SHD_nodes/SHD_material.c  | 140 +--------------------
 source/blender/nodes/intern/SHD_nodes/SHD_math.c   |   4 +-
 source/blender/nodes/intern/SHD_nodes/SHD_mixRgb.c |   4 +-
 source/blender/nodes/intern/SHD_nodes/SHD_normal.c |   4 +-
 source/blender/nodes/intern/SHD_nodes/SHD_output.c |   4 +-
 source/blender/nodes/intern/SHD_nodes/SHD_rgb.c    |   4 +-
 .../blender/nodes/intern/SHD_nodes/SHD_squeeze.c   |   4 +-
 .../blender/nodes/intern/SHD_nodes/SHD_texture.c   |   4 +-
 .../blender/nodes/intern/SHD_nodes/SHD_valToRgb.c  |   8 +-
 source/blender/nodes/intern/SHD_nodes/SHD_value.c  |   4 +-
 .../blender/nodes/intern/SHD_nodes/SHD_vectMath.c  |  15 +--
 15 files changed, 34 insertions(+), 241 deletions(-)

(limited to 'source/blender/nodes/intern/SHD_nodes')

diff --git a/source/blender/nodes/intern/SHD_nodes/SHD_camera.c b/source/blender/nodes/intern/SHD_nodes/SHD_camera.c
index 5f547b346e6..5134f720b9e 100644
--- a/source/blender/nodes/intern/SHD_nodes/SHD_camera.c
+++ b/source/blender/nodes/intern/SHD_nodes/SHD_camera.c
@@ -58,7 +58,7 @@ bNodeType sh_node_camera= {
 	/* output sock */	sh_node_camera_out,
 	/* storage     */	"node_camera",
 	/* execfunc    */	node_shader_exec_camera,
-   /* butfunc     */ NULL,
-                     NULL
+	/* butfunc     */ 	NULL,
+	/* initfunc    */   NULL
 };
 
diff --git a/source/blender/nodes/intern/SHD_nodes/SHD_curves.c b/source/blender/nodes/intern/SHD_nodes/SHD_curves.c
index 85897d42f13..39787486004 100644
--- a/source/blender/nodes/intern/SHD_nodes/SHD_curves.c
+++ b/source/blender/nodes/intern/SHD_nodes/SHD_curves.c
@@ -65,8 +65,8 @@ bNodeType sh_node_curve_vec= {
 	/* output sock */	sh_node_curve_vec_out,
 	/* storage     */	"CurveMapping",
 	/* execfunc    */	node_shader_exec_curve_vec,
-   /* butfunc     */ node_buts_curvevec,
-   /* initfunc    */ node_shader_init_curve_vec
+	/* butfunc     */ 	NULL,
+	/* initfunc    */   node_shader_init_curve_vec
 	
 };
 
@@ -105,7 +105,7 @@ bNodeType sh_node_curve_rgb= {
 	/* output sock */	sh_node_curve_rgb_out,
 	/* storage     */	"CurveMapping",
 	/* execfunc    */	node_shader_exec_curve_rgb,
-	/* butfunc     */ node_buts_curvecol,
-   /* initfunc    */ node_shader_init_curve_rgb
+	/* butfunc     */ 	NULL,
+	/* initfunc    */   node_shader_init_curve_rgb
 };
 
diff --git a/source/blender/nodes/intern/SHD_nodes/SHD_geom.c b/source/blender/nodes/intern/SHD_nodes/SHD_geom.c
index ce959b5d7e6..2be1f0ddfe8 100644
--- a/source/blender/nodes/intern/SHD_nodes/SHD_geom.c
+++ b/source/blender/nodes/intern/SHD_nodes/SHD_geom.c
@@ -108,18 +108,6 @@ static void node_shader_exec_geom(void *data, bNode *node, bNodeStack **in, bNod
 	}
 }
 
-static int node_shader_buts_geometry(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
-{
-   if(block) {
-      NodeGeometry *ngeo= (NodeGeometry*)node->storage;
-
-      uiDefBut(block, TEX, B_NODE_EXEC+node->nr, "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");
-      uiDefBut(block, TEX, B_NODE_EXEC+node->nr, "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");
-   }
-
-   return 40;
-}
-
 static void node_shader_init_geometry(bNode *node)
 {
    node->storage= MEM_callocN(sizeof(NodeGeometry), "NodeGeometry");
@@ -135,7 +123,7 @@ bNodeType sh_node_geom= {
 	/* output sock */	sh_node_geom_out,
 	/* storage     */	"NodeGeometry",
 	/* execfunc    */	node_shader_exec_geom,
-   /* butfunc     */ node_shader_buts_geometry,
-   /* initfunc    */ node_shader_init_geometry
+	/* butfunc     */ 	NULL,
+	/* initfunc    */   node_shader_init_geometry
 	
 };
diff --git a/source/blender/nodes/intern/SHD_nodes/SHD_mapping.c b/source/blender/nodes/intern/SHD_nodes/SHD_mapping.c
index 37ee7a9aac4..3a6e89cc0a1 100644
--- a/source/blender/nodes/intern/SHD_nodes/SHD_mapping.c
+++ b/source/blender/nodes/intern/SHD_nodes/SHD_mapping.c
@@ -63,54 +63,6 @@ static void node_shader_exec_mapping(void *data, bNode *node, bNodeStack **in, b
 	}
 }
 
-static int node_shader_buts_mapping(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
-{
-   if(block) {
-      TexMapping *texmap= node->storage;
-      short dx= (short)((butr->xmax-butr->xmin)/7.0f);
-      short dy= (short)(butr->ymax-19);
-
-      uiBlockSetFunc(block, node_texmap_cb, texmap, NULL);	/* all buttons get this */
-
-      uiBlockBeginAlign(block);
-      uiDefButF(block, NUM, B_NODE_EXEC+node->nr, "", butr->xmin+dx, dy, 2*dx, 19, texmap->loc, -1000.0f, 1000.0f, 10, 2, "");
-      uiDefButF(block, NUM, B_NODE_EXEC+node->nr, "", butr->xmin+3*dx, dy, 2*dx, 19, texmap->loc+1, -1000.0f, 1000.0f, 10, 2, "");
-      uiDefButF(block, NUM, B_NODE_EXEC+node->nr, "", butr->xmin+5*dx, dy, 2*dx, 19, texmap->loc+2, -1000.0f, 1000.0f, 10, 2, "");
-      dy-= 19;
-      uiDefButF(block, NUM, B_NODE_EXEC+node->nr, "", butr->xmin+dx, dy, 2*dx, 19, texmap->rot, -1000.0f, 1000.0f, 1000, 1, "");
-      uiDefButF(block, NUM, B_NODE_EXEC+node->nr, "", butr->xmin+3*dx, dy, 2*dx, 19, texmap->rot+1, -1000.0f, 1000.0f, 1000, 1, "");
-      uiDefButF(block, NUM, B_NODE_EXEC+node->nr, "", butr->xmin+5*dx, dy, 2*dx, 19, texmap->rot+2, -1000.0f, 1000.0f, 1000, 1, "");
-      dy-= 19;
-      uiDefButF(block, NUM, B_NODE_EXEC+node->nr, "", butr->xmin+dx, dy, 2*dx, 19, texmap->size, -1000.0f, 1000.0f, 10, 2, "");
-      uiDefButF(block, NUM, B_NODE_EXEC+node->nr, "", butr->xmin+3*dx, dy, 2*dx, 19, texmap->size+1, -1000.0f, 1000.0f, 10, 2, "");
-      uiDefButF(block, NUM, B_NODE_EXEC+node->nr, "", butr->xmin+5*dx, dy, 2*dx, 19, texmap->size+2, -1000.0f, 1000.0f, 10, 2, "");
-      dy-= 25;
-      uiBlockBeginAlign(block);
-      uiDefButF(block, NUM, B_NODE_EXEC+node->nr, "", butr->xmin+dx, dy, 2*dx, 19, texmap->min, -10.0f, 10.0f, 100, 2, "");
-      uiDefButF(block, NUM, B_NODE_EXEC+node->nr, "", butr->xmin+3*dx, dy, 2*dx, 19, texmap->min+1, -10.0f, 10.0f, 100, 2, "");
-      uiDefButF(block, NUM, B_NODE_EXEC+node->nr, "", butr->xmin+5*dx, dy, 2*dx, 19, texmap->min+2, -10.0f, 10.0f, 100, 2, "");
-      dy-= 19;
-      uiDefButF(block, NUM, B_NODE_EXEC+node->nr, "", butr->xmin+dx, dy, 2*dx, 19, texmap->max, -10.0f, 10.0f, 10, 2, "");
-      uiDefButF(block, NUM, B_NODE_EXEC+node->nr, "", butr->xmin+3*dx, dy, 2*dx, 19, texmap->max+1, -10.0f, 10.0f, 10, 2, "");
-      uiDefButF(block, NUM, B_NODE_EXEC+node->nr, "", butr->xmin+5*dx, dy, 2*dx, 19, texmap->max+2, -10.0f, 10.0f, 10, 2, "");
-      uiBlockEndAlign(block);
-
-      /* labels/options */
-
-      dy= (short)(butr->ymax-19);
-      uiDefBut(block, LABEL, B_NOP, "Loc", butr->xmin, dy, dx, 19, NULL, 0.0f, 0.0f, 0, 0, "");
-      dy-= 19;
-      uiDefBut(block, LABEL, B_NOP, "Rot", butr->xmin, dy, dx, 19, NULL, 0.0f, 0.0f, 0, 0, "");
-      dy-= 19;
-      uiDefBut(block, LABEL, B_NOP, "Size", butr->xmin, dy, dx, 19, NULL, 0.0f, 0.0f, 0, 0, "");
-      dy-= 25;
-      uiDefButBitI(block, TOG, TEXMAP_CLIP_MIN, B_NODE_EXEC+node->nr, "Min", butr->xmin, dy, dx-4, 19, &texmap->flag, 0.0f, 0.0f, 0, 0, "");
-      dy-= 19;
-      uiDefButBitI(block, TOG, TEXMAP_CLIP_MAX, B_NODE_EXEC+node->nr, "Max", butr->xmin, dy, dx-4, 19, &texmap->flag, 0.0f, 0.0f, 0, 0, "");
-
-   }	
-   return 5*19 + 6;
-}
 
 static void node_shader_init_mapping(bNode *node)
 {
@@ -126,8 +78,8 @@ bNodeType sh_node_mapping= {
 	/* output sock */	sh_node_mapping_out,
 	/* storage     */	"TexMapping",
 	/* execfunc    */	node_shader_exec_mapping,
-   /* butfunc     */ node_shader_buts_mapping,
-   /* initfunc    */ node_shader_init_mapping
+	/* butfunc     */ 	NULL,
+	/* initfunc    */   node_shader_init_mapping
 	
 };
 
diff --git a/source/blender/nodes/intern/SHD_nodes/SHD_material.c b/source/blender/nodes/intern/SHD_nodes/SHD_material.c
index 2640f2979fd..1d87d294dbe 100644
--- a/source/blender/nodes/intern/SHD_nodes/SHD_material.c
+++ b/source/blender/nodes/intern/SHD_nodes/SHD_material.c
@@ -128,142 +128,6 @@ static void node_shader_exec_material(void *data, bNode *node, bNodeStack **in,
 	}
 }
 
-static void node_mat_alone_cb(void *node_v, void *unused)
-{
-   bNode *node= node_v;
-
-   node->id= (ID *)copy_material((Material *)node->id);
-
-   BIF_undo_push("Single user material");
-   allqueue(REDRAWBUTSSHADING, 0);
-   allqueue(REDRAWNODE, 0);
-   allqueue(REDRAWOOPS, 0);
-}
-
-static void node_browse_mat_cb(void *ntree_v, void *node_v)
-{
-   bNodeTree *ntree= ntree_v;
-   bNode *node= node_v;
-
-   if(node->menunr<1) return;
-
-   if(node->menunr==32767) {	/* code for Add New */
-      if(node->id) {
-         /* make copy, but make sure it doesnt have the node tag nor nodes */
-         Material *ma= (Material *)node->id;
-         ma->id.us--;
-         ma= copy_material(ma);
-         ma->use_nodes= 0;
-         if(ma->nodetree) {
-            ntreeFreeTree(ma->nodetree);
-            MEM_freeN(ma->nodetree);
-         }
-         ma->nodetree= NULL;
-         node->id= (ID *)ma;
-      }
-      else node->id= (ID *)add_material("MatNode");
-   }
-   else {
-      if(node->id) node->id->us--;
-      node->id= BLI_findlink(&G.main->mat, node->menunr-1);
-      id_us_plus(node->id);
-   }
-   BLI_strncpy(node->name, node->id->name+2, 21);
-
-   nodeSetActive(ntree, node);
-
-   allqueue(REDRAWBUTSSHADING, 0);
-   allqueue(REDRAWNODE, 0);
-   BIF_preview_changed(ID_MA);
-
-   node->menunr= 0;
-}
-
-static void node_new_mat_cb(void *ntree_v, void *node_v)
-{
-   bNodeTree *ntree= ntree_v;
-   bNode *node= node_v;
-
-   node->id= (ID *)add_material("MatNode");
-   BLI_strncpy(node->name, node->id->name+2, 21);
-
-   nodeSetActive(ntree, node);
-
-   allqueue(REDRAWBUTSSHADING, 0);
-   allqueue(REDRAWNODE, 0);
-   BIF_preview_changed(ID_MA);
-
-}
-static int node_shader_buts_material(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
-{
-   if(block) {
-      uiBut *bt;
-      short dx= (short)((butr->xmax-butr->xmin)/3.0f), has_us= (node->id && node->id->us>1);
-      short dy= (short)butr->ymin;
-      char *strp;
-
-      /* WATCH IT: we use this callback in material buttons, but then only want first row */
-      if(butr->ymax-butr->ymin > 21.0f) dy+= 19;
-
-      uiBlockBeginAlign(block);
-      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);
-      node->menunr= 0;
-      bt= uiDefButS(block, MENU, B_NOP, strp, 
-         butr->xmin, dy, 19, 19, 
-         &node->menunr, 0, 0, 0, 0, "Browses existing choices or adds NEW");
-      uiButSetFunc(bt, node_browse_mat_cb, ntree, node);
-      if(strp) MEM_freeN(strp);
-
-      /* Add New button */
-      if(node->id==NULL) {
-         bt= uiDefBut(block, BUT, B_NOP, "Add New",
-            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 */
-         short width= (short)(butr->xmax-butr->xmin-19.0f - (has_us?19.0f:0.0f));
-         bt= uiDefBut(block, TEX, B_NOP, "MA:",
-            butr->xmin+19, dy, width, 19, 
-            node->id->name+2, 0.0, 19.0, 0, 0, "Material name");
-         uiButSetFunc(bt, node_ID_title_cb, node, NULL);
-
-         /* user amount */
-         if(has_us) {
-            char str1[32];
-            sprintf(str1, "%d", node->id->us);
-            bt= uiDefBut(block, BUT, B_NOP, str1, 
-               butr->xmax-19, dy, 19, 19, 
-               NULL, 0, 0, 0, 0, "Displays number of users. Click to make a single-user copy.");
-            uiButSetFunc(bt, node_mat_alone_cb, node, NULL);
-         }
-
-         /* 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+node->nr, "Diff",
-               butr->xmin, butr->ymin, dx, 19, 
-               &node->custom1, 0, 0, 0, 0, "Material Node outputs Diffuse");
-            uiDefButBitS(block, TOG, SH_NODE_MAT_SPEC, B_NODE_EXEC+node->nr, "Spec",
-               butr->xmin+dx, butr->ymin, dx, 19, 
-               &node->custom1, 0, 0, 0, 0, "Material Node outputs Specular");
-            uiDefButBitS(block, TOG, SH_NODE_MAT_NEG, B_NODE_EXEC+node->nr, "Neg Normal",
-               butr->xmax-dx, butr->ymin, dx, 19,
-               &node->custom1, 0, 0, 0, 0, "Material Node uses inverted Normal");
-         }
-      }
-      uiBlockEndAlign(block);
-   }	
-   return 38;
-}
 
 static void node_shader_init_material(bNode* node)
 {
@@ -280,8 +144,8 @@ bNodeType sh_node_material= {
 	/* output sock */	sh_node_material_out,
 	/* storage     */	"",
 	/* execfunc    */	node_shader_exec_material,
-   /* butfunc     */ node_shader_buts_material,
-   /* initfunc    */ node_shader_init_material
+	/* butfunc     */ 	NULL,
+	/* initfunc    */   node_shader_init_material
 	
 };
 
diff --git a/source/blender/nodes/intern/SHD_nodes/SHD_math.c b/source/blender/nodes/intern/SHD_nodes/SHD_math.c
index 89a7f58c147..3a08c3b117c 100644
--- a/source/blender/nodes/intern/SHD_nodes/SHD_math.c
+++ b/source/blender/nodes/intern/SHD_nodes/SHD_math.c
@@ -187,7 +187,7 @@ bNodeType sh_node_math= {
 	/* output sock */ sh_node_math_out, 
 	/* storage     */ "node_math", 
 	/* execfunc    */ node_shader_exec_math,
-   /* butfunc     */ node_buts_math,
-                     NULL
+	/* butfunc     */ 	NULL,
+	/* initfunc    */   NULL
 };
 
diff --git a/source/blender/nodes/intern/SHD_nodes/SHD_mixRgb.c b/source/blender/nodes/intern/SHD_nodes/SHD_mixRgb.c
index 182daa746b0..555a8d27ab9 100644
--- a/source/blender/nodes/intern/SHD_nodes/SHD_mixRgb.c
+++ b/source/blender/nodes/intern/SHD_nodes/SHD_mixRgb.c
@@ -69,7 +69,7 @@ bNodeType sh_node_mix_rgb= {
 	/* output sock */	sh_node_mix_rgb_out,
 	/* storage     */	"", 
 	/* execfunc    */	node_shader_exec_mix_rgb,
-   /* butfunc     */ node_buts_mix_rgb,
-                     NULL
+	/* butfunc     */ 	NULL,
+	/* initfunc    */   NULL
 	
 };
diff --git a/source/blender/nodes/intern/SHD_nodes/SHD_normal.c b/source/blender/nodes/intern/SHD_nodes/SHD_normal.c
index e92069917fc..4433e62cb25 100644
--- a/source/blender/nodes/intern/SHD_nodes/SHD_normal.c
+++ b/source/blender/nodes/intern/SHD_nodes/SHD_normal.c
@@ -66,7 +66,7 @@ bNodeType sh_node_normal= {
 	/* output sock */	sh_node_normal_out,
 	/* storage     */	"",
 	/* execfunc    */	node_shader_exec_normal,
-	/* butfunc     */ node_buts_normal,
-                     NULL
+	/* butfunc     */ 	NULL,
+	/* initfunc    */   NULL
 };
 
diff --git a/source/blender/nodes/intern/SHD_nodes/SHD_output.c b/source/blender/nodes/intern/SHD_nodes/SHD_output.c
index 84d72a04bde..c53d662fac7 100644
--- a/source/blender/nodes/intern/SHD_nodes/SHD_output.c
+++ b/source/blender/nodes/intern/SHD_nodes/SHD_output.c
@@ -71,8 +71,8 @@ bNodeType sh_node_output= {
 	/* output sock */	NULL,
 	/* storage     */	"",
 	/* execfunc    */	node_shader_exec_output,
-   /* butfunc     */ NULL,
-                     NULL
+	/* butfunc     */ 	NULL,
+	/* initfunc    */   NULL
 	
 };
 
diff --git a/source/blender/nodes/intern/SHD_nodes/SHD_rgb.c b/source/blender/nodes/intern/SHD_nodes/SHD_rgb.c
index c4195bd60d1..21b6f4640c2 100644
--- a/source/blender/nodes/intern/SHD_nodes/SHD_rgb.c
+++ b/source/blender/nodes/intern/SHD_nodes/SHD_rgb.c
@@ -51,7 +51,7 @@ bNodeType sh_node_rgb= {
 	/* output sock */	sh_node_rgb_out,
 	/* storage     */	"",
 	/* execfunc    */	node_shader_exec_rgb,
-   /* butfunc     */ node_buts_rgb,
-                     NULL
+	/* butfunc     */ 	NULL,
+	/* initfunc    */   NULL
 	
 };
diff --git a/source/blender/nodes/intern/SHD_nodes/SHD_squeeze.c b/source/blender/nodes/intern/SHD_nodes/SHD_squeeze.c
index 341945aa523..fa9cf3a3de0 100644
--- a/source/blender/nodes/intern/SHD_nodes/SHD_squeeze.c
+++ b/source/blender/nodes/intern/SHD_nodes/SHD_squeeze.c
@@ -63,7 +63,7 @@ bNodeType sh_node_squeeze= {
 	/* output sock */ sh_node_squeeze_out, 
 	/* storage     */ "node_squeeze", 
 	/* execfunc    */ node_shader_exec_squeeze,
-   /* butfunc     */ NULL,
-                     NULL
+	/* butfunc     */ 	NULL,
+	/* initfunc    */   NULL
 };
 
diff --git a/source/blender/nodes/intern/SHD_nodes/SHD_texture.c b/source/blender/nodes/intern/SHD_nodes/SHD_texture.c
index 5ea7a87af40..3da2b5cae71 100644
--- a/source/blender/nodes/intern/SHD_nodes/SHD_texture.c
+++ b/source/blender/nodes/intern/SHD_nodes/SHD_texture.c
@@ -119,8 +119,8 @@ bNodeType sh_node_texture= {
 	/* output sock */	sh_node_texture_out,
 	/* storage     */	"",
 	/* execfunc    */	node_shader_exec_texture,
-   /* butfunc     */ node_buts_texture,
-                     NULL
+	/* butfunc     */ 	NULL,
+	/* initfunc    */   NULL
 	
 };
 
diff --git a/source/blender/nodes/intern/SHD_nodes/SHD_valToRgb.c b/source/blender/nodes/intern/SHD_nodes/SHD_valToRgb.c
index a8e1449ee2e..223f8fc4af8 100644
--- a/source/blender/nodes/intern/SHD_nodes/SHD_valToRgb.c
+++ b/source/blender/nodes/intern/SHD_nodes/SHD_valToRgb.c
@@ -68,8 +68,8 @@ bNodeType sh_node_valtorgb= {
 	/* output sock */	sh_node_valtorgb_out,
 	/* storage     */	"ColorBand",
 	/* execfunc    */	node_shader_exec_valtorgb,
-   /* butfunc     */ node_buts_valtorgb,
-   /* initfunc    */ node_shader_init_valtorgb
+	/* butfunc     */ 	NULL,
+	/* initfunc    */   node_shader_init_valtorgb
 	
 };
 
@@ -101,8 +101,8 @@ bNodeType sh_node_rgbtobw= {
    /* output sock */	sh_node_rgbtobw_out,
    /* storage     */	"",
    /* execfunc    */	node_shader_exec_rgbtobw,
-   /* butfunc     */ NULL,
-   /* initfunc    */ NULL
+	/* butfunc     */ 	NULL,
+	/* initfunc    */   NULL
 
 };
 
diff --git a/source/blender/nodes/intern/SHD_nodes/SHD_value.c b/source/blender/nodes/intern/SHD_nodes/SHD_value.c
index 1437f3b6b86..aeeda4734b5 100644
--- a/source/blender/nodes/intern/SHD_nodes/SHD_value.c
+++ b/source/blender/nodes/intern/SHD_nodes/SHD_value.c
@@ -53,8 +53,8 @@ bNodeType sh_node_value= {
 	/* output sock */	sh_node_value_out,
 	/* storage     */	"", 
 	/* execfunc    */	node_shader_exec_value,
-   /* butfunc     */ node_buts_value,
-                     NULL
+	/* butfunc     */ 	NULL,
+	/* initfunc    */   NULL
 	
 };
 
diff --git a/source/blender/nodes/intern/SHD_nodes/SHD_vectMath.c b/source/blender/nodes/intern/SHD_nodes/SHD_vectMath.c
index 1a21f08ee55..1d1f36b9fa5 100644
--- a/source/blender/nodes/intern/SHD_nodes/SHD_vectMath.c
+++ b/source/blender/nodes/intern/SHD_nodes/SHD_vectMath.c
@@ -99,17 +99,6 @@ static void node_shader_exec_vect_math(void *data, bNode *node, bNodeStack **in,
 	
 }
 
-static int node_shader_buts_vect_math(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr) 
-{ 
-   if(block) { 
-      uiBut *bt; 
-
-      bt=uiDefButS(block, MENU, B_NODE_EXEC,  "Add %x0|Subtract %x1|Average %x2|Dot Product %x3 |Cross Product %x4|Normalize %x5", butr->xmin, butr->ymin, butr->xmax-butr->xmin, 20, &node->custom1, 0, 0, 0, 0, ""); 
-      uiButSetFunc(bt, node_but_title_cb, node, bt); 
-   } 
-   return 20; 
-}
-
 bNodeType sh_node_vect_math= { 
 	/* type code   */ SH_NODE_VECT_MATH, 
 	/* name        */ "Vector Math", 
@@ -119,7 +108,7 @@ bNodeType sh_node_vect_math= {
 	/* output sock */ sh_node_vect_math_out, 
 	/* storage     */ "node_vect_math", 
 	/* execfunc    */ node_shader_exec_vect_math,
-   /* butfunc     */ node_shader_buts_vect_math,
-                     NULL
+	/* butfunc     */ 	NULL,
+	/* initfunc    */   NULL
 };
 
-- 
cgit v1.2.3