[Bf-blender-cvs] [8381a18] cycles-ptex-12: Silence warning in Ptex
Nicholas Bishop
noreply at git.blender.org
Mon Jan 26 02:04:35 CET 2015
Commit: 8381a18d1ff336ec236dfd4d7a9cf6426724123c
Author: Nicholas Bishop
Date: Fri Jan 16 12:26:51 2015 +0100
Branches: cycles-ptex-12
https://developer.blender.org/rB8381a18d1ff336ec236dfd4d7a9cf6426724123c
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