diff options
| author | Hans Goudey <h.goudey@me.com> | 2022-09-15 02:51:38 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2022-09-15 02:51:38 +0300 |
| commit | 7d438ab6d88ae8f1ff08bf219297ab0f5f9d2b2e (patch) | |
| tree | 76c371caae544f762bd86cf128aff34e6e64fbac /source/blender/render/intern | |
| parent | a9ae1fab8346e13429fda59ff305951bf39e06cb (diff) | |
| parent | 04375869595e9276591cbb10179d22945dc01a36 (diff) | |
Merge branch 'refactor-mesh-selection-generic' into refactor-mesh-position-generic
Diffstat (limited to 'source/blender/render/intern')
| -rw-r--r-- | source/blender/render/intern/pipeline.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/render/intern/pipeline.cc b/source/blender/render/intern/pipeline.cc index d9ffb09c5a4..4b52fb62bee 100644 --- a/source/blender/render/intern/pipeline.cc +++ b/source/blender/render/intern/pipeline.cc @@ -1439,7 +1439,7 @@ static bool check_valid_compositing_camera(Scene *scene, Object *camera_override if (node->type == CMP_NODE_R_LAYERS && (node->flag & NODE_MUTED) == 0) { Scene *sce = node->id ? (Scene *)node->id : scene; if (sce->camera == nullptr) { - sce->camera = BKE_view_layer_camera_find(BKE_view_layer_default_render(sce)); + sce->camera = BKE_view_layer_camera_find(sce, BKE_view_layer_default_render(sce)); } if (sce->camera == nullptr) { /* all render layers nodes need camera */ @@ -1497,7 +1497,7 @@ static int check_valid_camera(Scene *scene, Object *camera_override, ReportList const char *err_msg = "No camera found in scene \"%s\""; if (camera_override == nullptr && scene->camera == nullptr) { - scene->camera = BKE_view_layer_camera_find(BKE_view_layer_default_render(scene)); + scene->camera = BKE_view_layer_camera_find(scene, BKE_view_layer_default_render(scene)); } if (!check_valid_camera_multiview(scene, scene->camera, reports)) { @@ -1511,7 +1511,8 @@ static int check_valid_camera(Scene *scene, Object *camera_override, ReportList (seq->scene != nullptr)) { if (!seq->scene_camera) { if (!seq->scene->camera && - !BKE_view_layer_camera_find(BKE_view_layer_default_render(seq->scene))) { + !BKE_view_layer_camera_find(seq->scene, + BKE_view_layer_default_render(seq->scene))) { /* camera could be unneeded due to composite nodes */ Object *override = (seq->scene == scene) ? camera_override : nullptr; |