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>2016-02-05 16:57:53 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2016-02-05 16:58:15 +0300
commitd3889e2cad20b4bdb90970b5ba0119c2729836bd (patch)
treec50413f7e25f67c3f5d7b988c843e2bdb94e4d43 /source/blender/render
parentc4dc14b079d81fd012383b910291246e7ebf9a04 (diff)
Fix T47329: Compositing fails to render unless each included scene was rendered since opening
Diffstat (limited to 'source/blender/render')
-rw-r--r--source/blender/render/intern/source/pipeline.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index 21b0d70dd75..8f5b3150bce 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -2815,13 +2815,14 @@ static bool check_valid_compositing_camera(Scene *scene, Object *camera_override
while (node) {
if (node->type == CMP_NODE_R_LAYERS && (node->flag & NODE_MUTED) == 0) {
Scene *sce = node->id ? (Scene *)node->id : scene;
-
- if (!sce->camera && !BKE_scene_camera_find(sce)) {
+ if (sce->camera == NULL) {
+ sce->camera = BKE_scene_camera_find(sce);
+ }
+ if (sce->camera == NULL) {
/* all render layers nodes need camera */
return false;
}
}
-
node = node->next;
}