diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-04-13 17:59:28 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-04-13 18:00:07 +0300 |
| commit | cae23bab6b5fdb0da96244c1ecc8c1586c9961f3 (patch) | |
| tree | 7386d3f11ebe3d9dffc2ead8476d073c7b660a34 /source/blender/blenkernel/intern/camera.c | |
| parent | f27e0b7c5e9d9ac1d80fc6b86d29ea96e971708d (diff) | |
Fix for crash with non-camera as a camera
Diffstat (limited to 'source/blender/blenkernel/intern/camera.c')
| -rw-r--r-- | source/blender/blenkernel/intern/camera.c | 6 |
1 files changed, 5 insertions, 1 deletions
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) |