svn merge -r 16866:17042 https://svn.blender.org/svnroot/bf-blender/trunk/blender

[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 888474ffa18bd2c492563dc2212d3def7589644b..112a1e9929dd68f667fa915bc318eef026b0bd64 100644 (file)
--- a/source/blender/render/extern/include/RE_shader_ext.h
+++ b/source/blender/render/extern/include/RE_shader_ext.h
@@ -113,7 +113,7 @@ typedef struct ShadeInput
        
        /* internal face coordinates */
        float u, v, dx_u, dx_v, dy_u, dy_v;
-       float co[3], view[3];
+       float co[3], view[3], camera_co[3];
        
        /* copy from material, keep synced so we can do memcopy */
        /* current size: 23*4 */
@@ -161,6 +161,7 @@ typedef struct ShadeInput
        
        int samplenr;                   /* sample counter, to detect if we should do shadow again */
        int depth;                              /* 1 or larger on raytrace shading */
+       int volume_depth;               /* number of intersections through volumes */
        
        /* stored copy of original face normal (facenor) 
         * before flipping. Used in Front/back output on geometry node */