Merge branch 'master' into blender2.8
[blender.git] / source / blender / render / intern / source / pipeline.c
index 00aee47b5e6cdb71c3af2f6114a8a6d4e1ddfc0e..2af2449c4ba3128e6caa136f7c2ec99c9e954de4 100644 (file)
@@ -2859,7 +2859,7 @@ static bool check_valid_camera_multiview(Scene *scene, Object *camera, ReportLis
        SceneRenderView *srv;
        bool active_view = false;
 
-       if ((scene->r.scemode & R_MULTIVIEW) == 0)
+       if (camera == NULL || (scene->r.scemode & R_MULTIVIEW) == 0)
                return true;
 
        for (srv = scene->r.views.first; srv; srv = srv->next) {