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@pandora.be>2012-11-23 21:39:41 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2012-11-23 21:39:41 +0400
commit2a9b5e8f816c5c72280aa66c82c3d94b666149c0 (patch)
treeee418dc9969bef7527e81f6f164fce97f0c117e8 /intern/cycles/blender/blender_camera.cpp
parentbb7fdc7935b8e909dfa10ec1dde654c6ce2f18a1 (diff)
Fix #33267: cycles math node power gave different results for CPU and GPU. The
GPU variants do not support pow(-1, 2), it doesn't check for even exponents, do manually now.
Diffstat (limited to 'intern/cycles/blender/blender_camera.cpp')
-rw-r--r--intern/cycles/blender/blender_camera.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/blender/blender_camera.cpp b/intern/cycles/blender/blender_camera.cpp
index 447ca07a6ee..0cbd2a0291f 100644
--- a/intern/cycles/blender/blender_camera.cpp
+++ b/intern/cycles/blender/blender_camera.cpp
@@ -300,7 +300,7 @@ static void blender_camera_sync(Camera *cam, BlenderCamera *bcam, int width, int
horizontal_fit = true;
sensor_size = bcam->sensor_width;
}
- else if(bcam->sensor_fit == BlenderCamera::VERTICAL) {
+ else { /* vertical */
horizontal_fit = false;
sensor_size = bcam->sensor_height;
}