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:
authorThomas Dinges <blender@dingto.org>2017-01-20 12:50:55 +0300
committerThomas Dinges <blender@dingto.org>2017-01-20 12:50:55 +0300
commit05ff32bd250d1ad0382fd02ab99af9e514d6f835 (patch)
treec9bf9cc4d10e36126a70f21e8138f6061a5ed34c
parent2e3fda2d95b4f0cb04b074c798ed266a41bf2a9d (diff)
Fix compile error (-Werror=float-conversion).
-rw-r--r--intern/cycles/render/object.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/render/object.cpp b/intern/cycles/render/object.cpp
index 8b8b988b969..c592b62829e 100644
--- a/intern/cycles/render/object.cpp
+++ b/intern/cycles/render/object.cpp
@@ -166,7 +166,7 @@ void Object::apply_transform(bool apply_to_motion)
float3 c0 = transform_get_column(&tfm, 0);
float3 c1 = transform_get_column(&tfm, 1);
float3 c2 = transform_get_column(&tfm, 2);
- float scalar = pow(fabsf(dot(cross(c0, c1), c2)), 1.0f/3.0f);
+ float scalar = powf(fabsf(dot(cross(c0, c1), c2)), 1.0f/3.0f);
/* apply transform to curve keys */
for(size_t i = 0; i < mesh->curve_keys.size(); i++) {