diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2022-11-12 01:18:46 +0300 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2022-11-12 01:18:46 +0300 |
| commit | c29795452cc71cb9f5a571a4aff0f593a2d7acaf (patch) | |
| tree | 53a46bb77f3102c545f7e55d3344e310b3bf6116 /source/blender/draw/engines/eevee_next/eevee_camera.cc | |
| parent | 9980fd0b8e1f3a07060316f28469f55a3f2fc0cd (diff) | |
| parent | 03ccf37162d365f3fdc8d8cd0cd6e9ff314fec6e (diff) | |
Merge branch 'master' into temp-sculpt-roll-mappingtemp-sculpt-roll-mapping
Diffstat (limited to 'source/blender/draw/engines/eevee_next/eevee_camera.cc')
| -rw-r--r-- | source/blender/draw/engines/eevee_next/eevee_camera.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/draw/engines/eevee_next/eevee_camera.cc b/source/blender/draw/engines/eevee_next/eevee_camera.cc index ad22219f0ae..4331db4bc4c 100644 --- a/source/blender/draw/engines/eevee_next/eevee_camera.cc +++ b/source/blender/draw/engines/eevee_next/eevee_camera.cc @@ -32,7 +32,7 @@ void Camera::init() CameraData &data = data_; - if (camera_eval) { + if (camera_eval && camera_eval->type == OB_CAMERA) { const ::Camera *cam = reinterpret_cast<const ::Camera *>(camera_eval->data); switch (cam->type) { default: @@ -112,7 +112,7 @@ void Camera::sync() data.uv_bias = float2(0.0f); } - if (camera_eval) { + if (camera_eval && camera_eval->type == OB_CAMERA) { const ::Camera *cam = reinterpret_cast<const ::Camera *>(camera_eval->data); data.clip_near = cam->clip_start; data.clip_far = cam->clip_end; |