Removed support for nested texture trees, minor ui enhancements
authorRobin Allen <roblovski@gmail.com>
Thu, 13 Nov 2008 09:57:11 +0000 (09:57 +0000)
committerRobin Allen <roblovski@gmail.com>
Thu, 13 Nov 2008 09:57:11 +0000 (09:57 +0000)
source/blender/src/buttons_shading.c
source/blender/src/drawnode.c
source/blender/src/editnode.c

index 6c1eff290724cc7f1217079b01ef08f159749cc5..4ca1c13ddb226c810dcc0beffcf5cbfaa0f2f1c4 100644 (file)
@@ -3700,7 +3700,8 @@ static void material_panel_texture(Object *ob, Material *ma)
                
                if(mtex->tex->use_nodes) {
                        char *menustr = ntreeTexOutputMenu(mtex->tex->nodetree);
-                       uiDefButS(block, MENU, B_MATPRV, menustr, 100, 100, 163, 20, &mtex->which_output, 0, 0, 0, 0, "Which output to use, for multi-output textures");
+                       uiDefBut(block, LABEL, 0, "Use Output:", 100, 100, 163, 20, 0, 0, 0, 0, 0, "");
+                       uiDefButS(block, MENU, B_MATPRV, menustr, 100, 80, 163, 20, &mtex->which_output, 0, 0, 0, 0, "Which output to use, for multi-output textures");
                        free(menustr);
                }
        }
index ddde111f14b57741225931e8e6eb55176bd95570..c9ee5d727bbce25d26cb2d7a53532a78ef93913d 100644 (file)
@@ -494,7 +494,12 @@ static void node_dynamic_update_cb(void *ntree_v, void *node_v)
 
 static int node_buts_texture(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr)
 {
-       short multi = (node->id && ((Tex*)node->id)->use_nodes && (node->type != CMP_NODE_TEXTURE));
+       short multi = (
+               node->id &&
+               ((Tex*)node->id)->use_nodes &&
+               (node->type != CMP_NODE_TEXTURE) &&
+               (node->type != TEX_NODE_TEXTURE)
+       );
        
        if(block) {
                uiBut *bt;
index 8fb47510485262ae2b6fc0046573835a0bd9aee1..f5de20891b4d2ebd97a455962ca9375b76efe0c8 100644 (file)
@@ -180,6 +180,7 @@ static void snode_handle_recalc(SpaceNode *snode)
        }
        else if(snode->treetype==NTREE_TEXTURE) {
                ntreeTexUpdatePreviews(snode->nodetree);
+               BIF_preview_changed(ID_TE);
        }
 }