From cae23bab6b5fdb0da96244c1ecc8c1586c9961f3 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 14 Apr 2015 00:59:28 +1000 Subject: Fix for crash with non-camera as a camera --- source/blender/blenkernel/intern/camera.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'source/blender/blenkernel/intern/camera.c') diff --git a/source/blender/blenkernel/intern/camera.c b/source/blender/blenkernel/intern/camera.c index fec6542ac47..d62628baa9e 100644 --- a/source/blender/blenkernel/intern/camera.c +++ b/source/blender/blenkernel/intern/camera.c @@ -931,6 +931,8 @@ float BKE_camera_multiview_shift_x(RenderData *rd, Object *camera, const char *v const bool is_multiview = (rd && rd->scemode & R_MULTIVIEW) != 0; Camera *data = camera->data; + BLI_assert(camera->type == OB_CAMERA); + if (!is_multiview) { return data->shiftx; } @@ -944,7 +946,9 @@ float BKE_camera_multiview_shift_x(RenderData *rd, Object *camera, const char *v void BKE_camera_multiview_params(RenderData *rd, CameraParams *params, Object *camera, const char *viewname) { - params->shiftx = BKE_camera_multiview_shift_x(rd, camera, viewname); + if (camera->type == OB_CAMERA) { + params->shiftx = BKE_camera_multiview_shift_x(rd, camera, viewname); + } } void BKE_camera_to_gpu_dof(struct Object *camera, struct GPUFXSettings *r_fx_settings) -- cgit v1.2.3