Commit: 9de0880407a255421020901ee419f9891569a188
Author: Nicholas Bishop
Date: Fri Jan 16 12:26:51 2015 +0100
Branches: cycles-ptex-06
https://developer.blender.org/rB9de0880407a255421020901ee419f9891569a188
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];
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
