[Bf-blender-cvs] [d3889e2] master: Fix T47329: Compositing fails to render unless each included scene was rendered since opening

[Sergey Sharybin]

Commit: d3889e2cad20b4bdb90970b5ba0119c2729836bd
Author: Sergey Sharybin
Date:   Fri Feb 5 14:57:53 2016 +0100
Branches: master
https://developer.blender.org/rBd3889e2cad20b4bdb90970b5ba0119c2729836bd

Fix T47329: Compositing fails to render unless each included scene was rendered since opening

===================================================================

M	source/blender/render/intern/source/pipeline.c

===================================================================

diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index 21b0d70..8f5b315 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;
 		}