Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2009-10-08 02:05:30 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2009-10-08 02:05:30 +0400
commitfd511eb984a23b63b373e171666667c8213579c0 (patch)
tree16ab444b76eb93d953364824bbf48025d2140ab3 /source/blender/nodes/intern/CMP_nodes/CMP_composite.c
parent1b7e5b9abe7c2431d1572cd39d687a139e7acb9a (diff)
Node Bugfixes:
* Compo node backdrop works again. * Compo node previews and backdrop now get correct color management float to byte conversion. * Compo nodes got unecessarily recalculated while moving nodes. * Fix compo node viewer nodes not getting activated correctly. * Main compo node preview render computations are now outside of mutex lock, so better for multithreading. * Tex node outputs did not work in some files loaded from 2.4. * Change RNA updates to take into account groups that may be shared between multiple node trees.
Diffstat (limited to 'source/blender/nodes/intern/CMP_nodes/CMP_composite.c')
-rw-r--r--source/blender/nodes/intern/CMP_nodes/CMP_composite.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_composite.c b/source/blender/nodes/intern/CMP_nodes/CMP_composite.c
index 800cccc2bfc..d117a3cb235 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_composite.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_composite.c
@@ -73,7 +73,7 @@ static void node_composit_exec_composite(void *data, bNode *node, bNodeStack **i
zbuf->malloc= 0;
free_compbuf(zbuf);
}
- generate_preview(node, outbuf);
+ generate_preview(data, node, outbuf);
/* we give outbuf to rr... */
rr->rectf= outbuf->rect;
@@ -91,7 +91,7 @@ static void node_composit_exec_composite(void *data, bNode *node, bNodeStack **i
}
}
if(in[0]->data)
- generate_preview(node, in[0]->data);
+ generate_preview(data, node, in[0]->data);
}
bNodeType cmp_node_composite= {