diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-05-06 22:41:56 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-05-06 22:41:56 +0300 |
commit | 8c2cec937bab7ace568bf5cd1448cd8632406883 (patch) | |
tree | b7a9430aa2261874bfac1d5d24b4f042b5e0741e | |
parent | e074554f8ffe16e5693c7f5ab33898f902166fad (diff) |
Fix T48262: Crash when trying to render a scene without camera.
-rw-r--r-- | source/blender/blenkernel/intern/camera.c | 2 | ||||
-rw-r--r-- | source/blender/render/intern/source/pipeline.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/camera.c b/source/blender/blenkernel/intern/camera.c index 6fd756e2788..bdf3432e6ea 100644 --- a/source/blender/blenkernel/intern/camera.c +++ b/source/blender/blenkernel/intern/camera.c @@ -904,7 +904,7 @@ static Object *camera_multiview_advanced(Scene *scene, Object *camera, const cha /* returns the camera to be used for render */ Object *BKE_camera_multiview_render(Scene *scene, Object *camera, const char *viewname) { - const bool is_multiview = (scene->r.scemode & R_MULTIVIEW) != 0; + const bool is_multiview = (camera != NULL) && (scene->r.scemode & R_MULTIVIEW) != 0; if (!is_multiview) { return camera; diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index 93666bd2a48..c88e3b36e27 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -2860,7 +2860,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) { |