[Bf-blender-cvs] [05ff32bd25] master: Fix compile error (-Werror=float-conversion).

Thomas Dinges noreply at git.blender.org
Fri Jan 20 10:51:27 CET 2017


Commit: 05ff32bd250d1ad0382fd02ab99af9e514d6f835
Author: Thomas Dinges
Date:   Fri Jan 20 10:50:55 2017 +0100
Branches: master
https://developer.blender.org/rB05ff32bd250d1ad0382fd02ab99af9e514d6f835

Fix compile error (-Werror=float-conversion).

===================================================================

M	intern/cycles/render/object.cpp

===================================================================

diff --git a/intern/cycles/render/object.cpp b/intern/cycles/render/object.cpp
index 8b8b988b96..c592b62829 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++) {




More information about the Bf-blender-cvs mailing list