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 'intern/cycles/scene/camera.cpp')
-rw-r--r--intern/cycles/scene/camera.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/intern/cycles/scene/camera.cpp b/intern/cycles/scene/camera.cpp
index eec269ab542..240e5d9c128 100644
--- a/intern/cycles/scene/camera.cpp
+++ b/intern/cycles/scene/camera.cpp
@@ -761,9 +761,7 @@ float Camera::world_to_raster_size(float3 P)
}
#else
camera_sample_panorama(&kernel_camera,
-# ifdef __CAMERA_MOTION__
kernel_camera_motion.data(),
-# endif
0.5f * full_width,
0.5f * full_height,
0.0f,
@@ -772,10 +770,7 @@ float Camera::world_to_raster_size(float3 P)
#endif
/* TODO: would it help to use more accurate differentials here? */
- differential3 dP;
- differential_transfer_compact(&dP, ray.dP, ray.D, ray.dD, ray.D, dist);
-
- return max(len(dP.dx), len(dP.dy));
+ return differential_transfer_compact(ray.dP, ray.D, ray.dD, dist);
}
return res;