svn merge -r 22371:22571 https://svn.blender.org/svnroot/bf-blender/branches/blender2...

[blender-staging.git] / source / blender / render / extern / include / RE_shader_ext.h

diff --git a/source/blender/render/extern/include/RE_shader_ext.h b/source/blender/render/extern/include/RE_shader_ext.h
index 5f5b493a9ecef60c83c7a1857c8863514c94c48e..9a340e625f3e8da78b90a98b480f0d652c073611 100644 (file)
--- a/source/blender/render/extern/include/RE_shader_ext.h
+++ b/source/blender/render/extern/include/RE_shader_ext.h
@@ -30,6 +30,7 @@
 #ifndef RE_SHADER_EXT_H
 #define RE_SHADER_EXT_H
 
 #ifndef RE_SHADER_EXT_H
 #define RE_SHADER_EXT_H
 

+#include "RE_raytrace.h" /* For RE_RAYCOUNTER */

 /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 /* this include is for shading and texture exports            */
 /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 /* this include is for shading and texture exports            */
 /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */


@@ -56,6 +57,7 @@ typedef struct ShadeResult
        float refr[3];
        float nor[3];
        float winspeed[4];
        float refr[3];
        float nor[3];
        float winspeed[4];

+       float rayhits[4];

 } ShadeResult;
 
 /* only here for quick copy */
 } ShadeResult;
 
 /* only here for quick copy */


@@ -177,6 +179,10 @@ typedef struct ShadeInput
        struct Group *light_override;
        struct Material *mat_override;
        
        struct Group *light_override;
        struct Material *mat_override;
        

+#ifdef RE_RAYCOUNTER
+       RayCounter raycounter;
+#endif
+       

 } ShadeInput;
 
 
 } ShadeInput;