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:
authorSergey Sharybin <sergey.vfx@gmail.com>2017-09-13 13:37:01 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2017-09-13 13:46:19 +0300
commit04800ed43434d053359cb3035eb082902fe80e4b (patch)
treee45f35f92ccfc75af7f0d983f0981703ec95e989 /source/blender/compositor/nodes/COM_RenderLayersNode.h
parentf472aea92202406dbec3115af3e1bd526643917e (diff)
Fix T52113: Compositor doesnt mix unrendered render layers well
Compositor was always defaulting to all-zero s output for missing passes. This was broken in 4cf7fc3.
Diffstat (limited to 'source/blender/compositor/nodes/COM_RenderLayersNode.h')
-rw-r--r--source/blender/compositor/nodes/COM_RenderLayersNode.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/compositor/nodes/COM_RenderLayersNode.h b/source/blender/compositor/nodes/COM_RenderLayersNode.h
index a90e09853c2..5c6c5e17d1f 100644
--- a/source/blender/compositor/nodes/COM_RenderLayersNode.h
+++ b/source/blender/compositor/nodes/COM_RenderLayersNode.h
@@ -43,8 +43,11 @@ private:
Scene *scene,
int layerId,
bool is_preview) const;
-
void testRenderLink(NodeConverter &converter,
const CompositorContext &context,
Render *re) const;
+
+ void missingSocketLink(NodeConverter &converter,
+ NodeOutput *output) const;
+ void missingRenderLink(NodeConverter &converter) const;
};