kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix for crash with non-camera as a camera

Browse Source
This commit is contained in:
Campbell Barton 2015-04-14 00:59:28 +10:00
parent f27e0b7c5e
commit cae23bab6b
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/blenkernel/intern/camera.c
View File

@ -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; const bool is_multiview = (rd && rd->scemode & R_MULTIVIEW) != 0;
Camera *data = camera->data; Camera *data = camera->data;
BLI_assert(camera->type == OB_CAMERA);
if (!is_multiview) { if (!is_multiview) {
return data->shiftx; 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) 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) void BKE_camera_to_gpu_dof(struct Object *camera, struct GPUFXSettings *r_fx_settings)