Three fixes:

- Crash, caused by commit of 1 hour ago to fix 'All Z' render problem
- Bug: yesterday's fix for node material renders caused some issues with
  precalculating correct shadow.
- Composite Translate node: input sockets allowed multiple inputs

1 files changed, 2 insertions, 3 deletions

diff --git a/source/blender/render/extern/include/RE_shader_ext.h b/source/blender/render/extern/include/RE_shader_ext.h
index f8c6e673ab3..efe19a6b6ec 100644
--- a/source/blender/render/extern/include/RE_shader_ext.h
+++ b/source/blender/render/extern/include/RE_shader_ext.h
@@ -71,6 +71,7 @@ struct ShadeInputCopy {
 	short puno;
 	float vn[3], vno[3];			/* actual render normal, and a copy to restore it */
 	float n1[3], n2[3], n3[3];		/* vertex normals, corrected */
+	int mode;						/* base material mode (OR-ed result of entire node tree) */
 };
 
 /* localized renderloop data */
@@ -88,6 +89,7 @@ typedef struct ShadeInput
 	short puno;
 	float vn[3], vno[3];			/* actual render normal, and a copy to restore it */
 	float n1[3], n2[3], n3[3];		/* vertex normals, corrected */
+	int mode;						/* base material mode (OR-ed result of entire node tree) */
 	
 	/* internal face coordinates */
 	float u, v, dx_u, dx_v, dy_u, dy_v;
@@ -109,9 +111,6 @@ typedef struct ShadeInput
 	int har;
 	float layerfac;
 	
-	/* base material mode (OR-ed result of entire node tree) */
-	int mode;
-	
 	/* texture coordinates */
 	float lo[3], gl[3], uv[3], ref[3], orn[3], winco[3], sticky[3], vcol[3], rad[3];
 	float refcol[4], displace[3];