Merged revision(s) 58859-58993 from trunk/blender into soc-2013-dingto.
[blender.git] / intern / cycles / kernel / kernel_types.h
index 03ca04ec132203cdca6afff83a8f956c18776695..0608dad5c05a02326410e7cb37867aefbe9d6d05 100644 (file)
@@ -44,11 +44,11 @@ CCL_NAMESPACE_BEGIN
 #define BSSRDF_MIN_RADIUS                      1e-8f
 #define BSSRDF_MAX_ATTEMPTS                    8
 
 #define BSSRDF_MIN_RADIUS                      1e-8f
 #define BSSRDF_MAX_ATTEMPTS                    8
 
-#define BB_DRAPPER                             800.0
-#define BB_MAX_TABLE_RANGE             12000.0
-#define BB_TABLE_XPOWER                        1.5
-#define BB_TABLE_YPOWER                        5.0
-#define BB_TABLE_SPACING               2.0
+#define BB_DRAPPER                             800.0f
+#define BB_MAX_TABLE_RANGE             12000.0f
+#define BB_TABLE_XPOWER                        1.5f
+#define BB_TABLE_YPOWER                        5.0f
+#define BB_TABLE_SPACING               2.0f
 
 #define TEX_NUM_FLOAT_IMAGES   5
 
 
 #define TEX_NUM_FLOAT_IMAGES   5
 
@@ -833,7 +833,7 @@ typedef struct KernelBSSRDF {
 typedef struct KernelBlackbody {
        int table_offset;
        int pad1, pad2, pad3;
 typedef struct KernelBlackbody {
        int table_offset;
        int pad1, pad2, pad3;
-} KernelBLACKBODY;
+} KernelBlackbody;
 
 
 typedef struct KernelData {
 
 
 typedef struct KernelData {