[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17439] trunk/blender/source/blender/src: Removed support for nested texture trees, minor ui enhancements

[Robin Allen]

Revision: 17439
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17439
Author:   kakbarnf
Date:     2008-11-13 10:57:11 +0100 (Thu, 13 Nov 2008)

Log Message:
-----------
Removed support for nested texture trees, minor ui enhancements

Modified Paths:
--------------
    trunk/blender/source/blender/src/buttons_shading.c
    trunk/blender/source/blender/src/drawnode.c
    trunk/blender/source/blender/src/editnode.c

Modified: trunk/blender/source/blender/src/buttons_shading.c
===================================================================
--- trunk/blender/source/blender/src/buttons_shading.c  2008-11-13 04:15:19 UTC 
(rev 17438)
+++ trunk/blender/source/blender/src/buttons_shading.c  2008-11-13 09:57:11 UTC 
(rev 17439)
@@ -3700,7 +3700,8 @@
                
                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);
                }
        }

Modified: trunk/blender/source/blender/src/drawnode.c
===================================================================
--- trunk/blender/source/blender/src/drawnode.c 2008-11-13 04:15:19 UTC (rev 
17438)
+++ trunk/blender/source/blender/src/drawnode.c 2008-11-13 09:57:11 UTC (rev 
17439)
@@ -494,7 +494,12 @@
 
 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;

Modified: trunk/blender/source/blender/src/editnode.c
===================================================================
--- trunk/blender/source/blender/src/editnode.c 2008-11-13 04:15:19 UTC (rev 
17438)
+++ trunk/blender/source/blender/src/editnode.c 2008-11-13 09:57:11 UTC (rev 
17439)
@@ -180,6 +180,7 @@
        }
        else if(snode->treetype==NTREE_TEXTURE) {
                ntreeTexUpdatePreviews(snode->nodetree);
+               BIF_preview_changed(ID_TE);
        }
 }
 


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs