griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Removed support for nested texture trees, minor ui enhancements

Browse Source
This commit is contained in:
Robin Allen
2008-11-13 09:57:11 +00:00
parent 934b21f5d9
commit c838ee9592
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/src/buttons_shading.c
View 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);
}
}

7
source/blender/src/drawnode.c
View 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;

1
source/blender/src/editnode.c
View 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);
}
}