Merge branch 'master' into blender2.8
[blender.git] / source / blender / render / extern / include / RE_shader_ext.h
index e1cb922f6a5d11d518596798ffdc712985746d6f..281f0082d7f5cdcb77fa0a4eff4e06605d3106c0 100644 (file)
@@ -179,8 +179,6 @@ typedef struct ShadeInput {
        unsigned int lay;
        int layflag, passflag, combinedflag;
        short object_pass_index;
        unsigned int lay;
        int layflag, passflag, combinedflag;
        short object_pass_index;
-       struct Group *light_override;
-       struct Material *mat_override;
 
 #ifdef RE_RAYCOUNTER
        RayCounter raycounter;
 
 #ifdef RE_RAYCOUNTER
        RayCounter raycounter;