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:
authorDalai Felinto <dfelinto@gmail.com>2015-09-22 00:20:30 +0300
committerDalai Felinto <dfelinto@gmail.com>2015-09-22 01:56:14 +0300
commit372dff8d1dc7e24d4b2cd37de245588ecfce8bfa (patch)
tree009712f80f078d91eee1627b908ffe6638ca9a3f
parent91d64cbf0f1668efaa058ec0eed19e242883ead0 (diff)
Silence double promotion error/warnings
-rw-r--r--intern/cycles/util/util_distort.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/util/util_distort.h b/intern/cycles/util/util_distort.h
index 6f8d4f259ff..174b918677c 100644
--- a/intern/cycles/util/util_distort.h
+++ b/intern/cycles/util/util_distort.h
@@ -65,8 +65,8 @@ ccl_device void util_invert_polynomial_distortion(const float2 image,
image.x, image.y,
&normalized_x,
&normalized_y);
- result->x = normalized_x * focal_length + principal_point.x;
- result->y = normalized_y * focal_length + principal_point.y;
+ result->x = normalized_x * (double)focal_length + (double)principal_point.x;
+ result->y = normalized_y * (double)focal_length + (double)principal_point.y;
#else
*result = image;
#endif