Merged revision(s) 58859-58993 from trunk/blender into soc-2013-dingto.
authorThomas Dinges <blender@dingto.org>
Wed, 7 Aug 2013 16:57:18 +0000 (16:57 +0000)
committerThomas Dinges <blender@dingto.org>
Wed, 7 Aug 2013 16:57:18 +0000 (16:57 +0000)
1  2 
intern/cycles/kernel/kernel_types.h

index 03ca04ec132203cdca6afff83a8f956c18776695,99f3724afb513ae142d52a28b020f0650478baf2..0608dad5c05a02326410e7cb37867aefbe9d6d05
@@@ -44,11 -44,11 +44,11 @@@ CCL_NAMESPACE_BEGI
  #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
  
@@@ -68,7 -68,6 +68,7 @@@
  #define __KERNEL_SHADING__
  #if __CUDA_ARCH__ >= 200
  #define __KERNEL_ADV_SHADING__
 +#define __NON_PROGRESSIVE__
  #endif
  #endif
  
@@@ -833,7 -832,7 +833,7 @@@ typedef struct KernelBSSRDF 
  typedef struct KernelBlackbody {
        int table_offset;
        int pad1, pad2, pad3;
- } KernelBLACKBODY;
+ } KernelBlackbody;
  
  
  typedef struct KernelData {