Work on RenderLayer and Pass control:

Full log:
http://www.blender3d.org/cms/Render_Passes.829.0.html

In short:
- Passes now have option to be excluded from "Combined".
- RenderLayers allow to override Light (Lamp groups) or Material.
- RenderLayers and Passes are in Outliner now, (ab)using Matt's nice
  'restriction collumns'. :)

2 files changed, 9 insertions, 5 deletions

diff --git a/source/blender/render/extern/include/RE_pipeline.h b/source/blender/render/extern/include/RE_pipeline.h
index 0a07dd4cdac..22b623816ab 100644
--- a/source/blender/render/extern/include/RE_pipeline.h
+++ b/source/blender/render/extern/include/RE_pipeline.h
@@ -70,7 +70,10 @@ typedef struct RenderLayer {
 	/* copy of RenderData */
 	char name[RE_MAXNAME];		
 	unsigned int lay;			
-	int layflag, passflag;		
+	int layflag, passflag, pass_xor;		
+	
+	struct Material *mat_override;
+	struct Group *light_override;
 	
 	float *rectf;		/* 4 float, standard rgba buffer */
 	float *acolrect;	/* 4 float, optional transparent buffer, needs storage for display updates */
diff --git a/source/blender/render/extern/include/RE_shader_ext.h b/source/blender/render/extern/include/RE_shader_ext.h
index efe19a6b6ec..18fabc91036 100644
--- a/source/blender/render/extern/include/RE_shader_ext.h
+++ b/source/blender/render/extern/include/RE_shader_ext.h
@@ -48,14 +48,14 @@ typedef struct ShadeResult
 	float combined[4];
 	float col[4];
 	float alpha;
-	float diff[3];		/* includes ramps, shadow, etc */
-	float diff_raw[3];	/* pure diffuse, no shadow no ramps */
+	float diff[3];		/* no ramps, shadow, etc */
 	float spec[3];
 	float shad[3];
 	float ao[3];
 	float refl[3];
 	float refr[3];
 	float nor[3];
+	float rad[3];
 	float winspeed[4];
 } ShadeResult;
 
@@ -139,8 +139,9 @@ typedef struct ShadeInput
 	short do_preview;		/* for nodes, in previewrender */
 	short thread, sample;	/* sample: ShadeSample array index */
 	unsigned int lay;
-	int layflag, passflag;
-	
+	int layflag, passflag, combinedflag;
+	struct Group *light_override;
+	struct Material *mat_override;
 } ShadeInput;