archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Bugfix #25392

Browse Source 
Compositor: Texture node didn't use texture-nodes itself.
Now composites initialize texture nodes correctly.

Also reviewed the fix for crashing texture nodes for displace.
It appears texture nodes also are used for sculpt/paint 
brushes, in these cases it can be allowed again. But, don't
do this during rendering for now!
This commit is contained in:
Ton Roosendaal
2010-12-27 19:26:38 +00:00
parent 1a8cc0a8f0
commit b2be78c0cc
4 changed files with 34 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
source/blender/blenkernel/intern/node.c
View File

@@ -2474,6 +2474,25 @@ static bNode *getExecutableNode(bNodeTree *ntree)
return NULL;
}
/* check if texture nodes need exec or end */
static void ntree_composite_texnode(bNodeTree *ntree, int init)
{
bNode *node;
for(node= ntree->nodes.first; node; node= node->next) {
if(node->type==CMP_NODE_TEXTURE && node->id) {
Tex *tex= (Tex *)node->id;
if(tex->nodetree && tex->use_nodes) {
/* has internal flag to detect it only does it once */
if(init)
ntreeBeginExecTree(tex->nodetree);
else
ntreeEndExecTree(tex->nodetree);
}
}
}
}
/* optimized tree execute test for compositing */
void ntreeCompositExecTree(bNodeTree *ntree, RenderData *rd, int do_preview)
@@ -2489,6 +2508,7 @@ void ntreeCompositExecTree(bNodeTree *ntree, RenderData *rd, int do_preview)
ntreeInitPreview(ntree, 0, 0);
ntreeBeginExecTree(ntree);
ntree_composite_texnode(ntree, 1);
/* prevent unlucky accidents */
if(G.background)