Damn! Commit for render passes in wrong dir....

4 files changed, 8 insertions, 2 deletions

diff --git a/source/blender/makesdna/DNA_meshdata_types.h b/source/blender/makesdna/DNA_meshdata_types.h
index a7c1e6c1e46..e341779c339 100644
--- a/source/blender/makesdna/DNA_meshdata_types.h
+++ b/source/blender/makesdna/DNA_meshdata_types.h
@@ -162,6 +162,7 @@ typedef struct PartialVisibility {
 #define ME_SHARP			(1<<9)
 
 /* puno = vertexnormal (mface) */
+/* render assumes flips to be ordered like this */
 #define ME_FLIPV1		1
 #define ME_FLIPV2		2
 #define ME_FLIPV3		4
diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h
index b592a8fb56a..034369f6fe2 100644
--- a/source/blender/makesdna/DNA_node_types.h
+++ b/source/blender/makesdna/DNA_node_types.h
@@ -86,9 +86,12 @@ typedef struct bNodeSocket {
 #define SOCK_RGBA		2
 
 /* sock->flag, first bit is select */
+		/* hidden is user defined, to hide unused */
 #define SOCK_HIDDEN				2
 		/* only used now for groups... */
 #define SOCK_IN_USE				4
+		/* unavailable is for dynamic sockets */
+#define SOCK_UNAVAIL			8
 
 #
 #
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index d01973bce4f..f9055dfc11b 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -167,7 +167,7 @@ typedef struct Object {
     void *sumohandle;
     
 	float bbsize[3];
-	short dfras;
+	short index;			/* custom index, for renderpasses */
 	unsigned short actdef;	/* current deformation group */
 	float col[4];
 	/**
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 8bde77f45ab..2413bde0d1e 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -139,9 +139,11 @@ typedef struct SceneRenderLayer {
 #define SCE_PASS_SPEC		16
 #define SCE_PASS_SHADOW		32
 #define SCE_PASS_AO			64
-#define SCE_PASS_RAY		128
+#define SCE_PASS_REFLECT	128
 #define SCE_PASS_NORMAL		256
 #define SCE_PASS_VECTOR		512
+#define SCE_PASS_REFRACT	1024
+#define SCE_PASS_INDEXOB	2048
 
 typedef struct RenderData {
 	struct AviCodecData *avicodecdata;