[Bf-blender-cvs] [f86cafe] cycles-ptex-08: Silence warning in Ptex

Nicholas Bishop noreply at git.blender.org
Tue Jan 20 13:57:09 CET 2015


Commit: f86cafee7545beb59f877f1771f122a8562862c4
Author: Nicholas Bishop
Date:   Fri Jan 16 12:26:51 2015 +0100
Branches: cycles-ptex-08
https://developer.blender.org/rBf86cafee7545beb59f877f1771f122a8562862c4

Silence warning in Ptex

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

M	extern/ptex/src/ptex/Ptexture.h

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

diff --git a/extern/ptex/src/ptex/Ptexture.h b/extern/ptex/src/ptex/Ptexture.h
index c6fa069..7a42488 100644
--- a/extern/ptex/src/ptex/Ptexture.h
+++ b/extern/ptex/src/ptex/Ptexture.h
@@ -142,7 +142,7 @@ struct Ptex {
 
     /** Lookup up inverse value of given data type that corresponds to the normalized value of 1.0. */
     static float OneValueInv(DataType dt) {
-	static const float one[] = { 1.0/255.0, 1.0/65535.0, 1.0, 1.0 };
+	static const float one[] = { 1.0f/255.0f, 1.0f/65535.0f, 1.0f, 1.0f };
 	return one[dt]; 
     }




More information about the Bf-blender-cvs mailing list