Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/blenkernel/intern/camera.c')
-rw-r--r--source/blender/blenkernel/intern/camera.c6
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)