diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-03-27 18:35:34 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-03-27 18:35:34 +0300 |
| commit | 57101c4fd26a85f4994d4d4d3f433c37f95367d0 (patch) | |
| tree | 09d40feb19a41df0f32a05ff1975653f865b743e /source/blender/nodes/intern/CMP_nodes/CMP_image.c | |
| parent | 17777e7cd195318c36a1172647557447330dd3a4 (diff) | |
Second attempt at committing the different render slot implementation. This
has a fix that hopefully solves the problem on mac/win. Also fixes #21322,
render slots not working well with FSA.
Diffstat (limited to 'source/blender/nodes/intern/CMP_nodes/CMP_image.c')
| -rw-r--r-- | source/blender/nodes/intern/CMP_nodes/CMP_image.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_image.c b/source/blender/nodes/intern/CMP_nodes/CMP_image.c index be91eb61587..f53e3d2ba8f 100644 --- a/source/blender/nodes/intern/CMP_nodes/CMP_image.c +++ b/source/blender/nodes/intern/CMP_nodes/CMP_image.c @@ -354,7 +354,7 @@ void node_composit_rlayers_out(RenderData *rd, RenderLayer *rl, bNodeStack **out static void node_composit_exec_rlayers(void *data, bNode *node, bNodeStack **in, bNodeStack **out) { Scene *sce= (Scene *)node->id; - Render *re= (sce)? RE_GetRender(sce->id.name, RE_SLOT_RENDERING): NULL; + Render *re= (sce)? RE_GetRender(sce->id.name): NULL; RenderData *rd= data; RenderResult *rr= NULL; |