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:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2019-01-17 18:28:43 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2019-01-17 18:36:05 +0300
commit260b786d0724fc115c1b9920acbbfb04a5fc6cf8 (patch)
tree13e13738fd4dee619a4f82258be04257df076d8e /source/blender/blenkernel/intern/camera.c
parent1a3abc7f79aa8f4550addfb5925fc8c3786b4753 (diff)
Fix T60558: Cycles viewport render mismatch when the camera is a light.
Diffstat (limited to 'source/blender/blenkernel/intern/camera.c')
-rw-r--r--source/blender/blenkernel/intern/camera.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/camera.c b/source/blender/blenkernel/intern/camera.c
index d791ab01482..7cf16b2b772 100644
--- a/source/blender/blenkernel/intern/camera.c
+++ b/source/blender/blenkernel/intern/camera.c
@@ -213,10 +213,7 @@ void BKE_camera_params_from_object(CameraParams *params, const Object *ob)
else if (ob->type == OB_LAMP) {
/* lamp object */
Lamp *la = ob->data;
- float fac = cosf(la->spotsize * 0.5f);
- float phi = acosf(fac);
-
- params->lens = 16.0f * fac / sinf(phi);
+ params->lens = 16.0f / tanf(la->spotsize * 0.5f);
if (params->lens == 0.0f)
params->lens = 35.0f;