svn merge ^/trunk/blender -r43685:43693

16 files changed, 358 insertions, 88 deletions

diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h
index 2fa587e168a..0cccd8a366b 100644
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@ -557,25 +557,34 @@ void			ntreeGPUMaterialNodes(struct bNodeTree *ntree, struct GPUMaterial *mat);
 /* ************** COMPOSITE NODES *************** */
 
 /* output socket defines */
-#define RRES_OUT_IMAGE		0
-#define RRES_OUT_ALPHA		1
-#define RRES_OUT_Z			2
-#define RRES_OUT_NORMAL		3
-#define RRES_OUT_UV			4
-#define RRES_OUT_VEC		5
-#define RRES_OUT_RGBA		6
-#define RRES_OUT_DIFF		7
-#define RRES_OUT_SPEC		8
-#define RRES_OUT_SHADOW		9
-#define RRES_OUT_AO			10
-#define RRES_OUT_REFLECT	11
-#define RRES_OUT_REFRACT	12
-#define RRES_OUT_INDIRECT	13
-#define RRES_OUT_INDEXOB	14
-#define RRES_OUT_INDEXMA	15
-#define RRES_OUT_MIST		16
-#define RRES_OUT_EMIT		17
-#define RRES_OUT_ENV		18
+#define RRES_OUT_IMAGE				0
+#define RRES_OUT_ALPHA				1
+#define RRES_OUT_Z					2
+#define RRES_OUT_NORMAL				3
+#define RRES_OUT_UV					4
+#define RRES_OUT_VEC				5
+#define RRES_OUT_RGBA				6
+#define RRES_OUT_DIFF				7
+#define RRES_OUT_SPEC				8
+#define RRES_OUT_SHADOW				9
+#define RRES_OUT_AO					10
+#define RRES_OUT_REFLECT			11
+#define RRES_OUT_REFRACT			12
+#define RRES_OUT_INDIRECT			13
+#define RRES_OUT_INDEXOB			14
+#define RRES_OUT_INDEXMA			15
+#define RRES_OUT_MIST				16
+#define RRES_OUT_EMIT				17
+#define RRES_OUT_ENV				18
+#define RRES_OUT_DIFF_DIRECT		19
+#define RRES_OUT_DIFF_INDIRECT		20
+#define RRES_OUT_DIFF_COLOR			21
+#define RRES_OUT_GLOSSY_DIRECT		22
+#define RRES_OUT_GLOSSY_INDIRECT	23
+#define RRES_OUT_GLOSSY_COLOR		24
+#define RRES_OUT_TRANSM_DIRECT		25
+#define RRES_OUT_TRANSM_INDIRECT	26
+#define RRES_OUT_TRANSM_COLOR		27
 
 /* note: types are needed to restore callbacks, don't change values */
 #define CMP_NODE_VIEWER		201
diff --git a/source/blender/blenkernel/BKE_tracking.h b/source/blender/blenkernel/BKE_tracking.h
index d3f297ece86..f720050f59c 100644
--- a/source/blender/blenkernel/BKE_tracking.h
+++ b/source/blender/blenkernel/BKE_tracking.h
@@ -61,6 +61,7 @@ struct MovieTrackingMarker *BKE_tracking_get_marker(struct MovieTrackingTrack *t
 struct MovieTrackingMarker *BKE_tracking_ensure_marker(struct MovieTrackingTrack *track, int framenr);
 struct MovieTrackingMarker *BKE_tracking_exact_marker(struct MovieTrackingTrack *track, int framenr);
 int BKE_tracking_has_marker(struct MovieTrackingTrack *track, int framenr);
+int BKE_tracking_has_enabled_marker(struct MovieTrackingTrack *track, int framenr);
 
 void BKE_tracking_free_track(struct MovieTrackingTrack *track);
 
diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c
index c548115e5ab..44a204028f6 100644
--- a/source/blender/blenkernel/intern/mesh.c
+++ b/source/blender/blenkernel/intern/mesh.c
@@ -2464,7 +2464,7 @@ int mesh_recalcTesselation(CustomData *fdata,
 
 
 #ifdef USE_TESSFACE_QUADS
-		test_index_face(mf, fdata, mface_index, 4);
+		test_index_face(mf, fdata, mface_index, mf_len);
 #endif
 
 	}
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 281631168cd..c8ec71d512f 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -531,6 +531,8 @@ Scene *add_scene(const char *name)
 	sce->gm.recastData.detailsampledist = 6.0f;
 	sce->gm.recastData.detailsamplemaxerror = 1.0f;
 
+	sce->gm.exitkey = 218; // Blender key code for ESC
+
 	sound_create_scene(sce);
 
 	return sce;
diff --git a/source/blender/blenkernel/intern/tracking.c b/source/blender/blenkernel/intern/tracking.c
index 0c3c43bebc3..ea3f076523f 100644
--- a/source/blender/blenkernel/intern/tracking.c
+++ b/source/blender/blenkernel/intern/tracking.c
@@ -395,6 +395,13 @@ int BKE_tracking_has_marker(MovieTrackingTrack *track, int framenr)
 	return BKE_tracking_exact_marker(track, framenr) != 0;
 }
 
+int BKE_tracking_has_enabled_marker(MovieTrackingTrack *track, int framenr)
+{
+	MovieTrackingMarker *marker = BKE_tracking_exact_marker(track, framenr);
+
+	return marker && (marker->flag & MARKER_DISABLED) == 0;
+}
+
 void BKE_tracking_free_track(MovieTrackingTrack *track)
 {
 	if(track->markers) MEM_freeN(track->markers);
@@ -1741,8 +1748,8 @@ static int count_tracks_on_both_keyframes(MovieTracking *tracking, ListBase *tra
 
 	track= tracksbase->first;
 	while(track) {
-		if(BKE_tracking_has_marker(track, frame1))
-			if(BKE_tracking_has_marker(track, frame2))
+		if(BKE_tracking_has_enabled_marker(track, frame1))
+			if(BKE_tracking_has_enabled_marker(track, frame2))
 				tot++;
 
 		track= track->next;
@@ -1758,7 +1765,7 @@ int BKE_tracking_can_reconstruct(MovieTracking *tracking, MovieTrackingObject *o
 	ListBase *tracksbase= BKE_tracking_object_tracks(tracking, object);
 
 	if(count_tracks_on_both_keyframes(tracking, tracksbase)<8) {
-		BLI_strncpy(error_msg, "At least 8 tracks on both of keyframes are needed for reconstruction", error_size);
+		BLI_strncpy(error_msg, "At least 8 common tracks on both of keyframes are needed for reconstruction", error_size);
 		return 0;
 	}
 
@@ -1838,7 +1845,7 @@ MovieReconstructContext* BKE_tracking_reconstruction_context_new(MovieTracking *
 
 	context->k1= camera->k1;
 	context->k2= camera->k2;
-	context->k2= camera->k2;
+	context->k3= camera->k3;
 
 	return context;
 }
diff --git a/source/blender/editors/armature/reeb.c b/source/blender/editors/armature/reeb.c
index 10a886edd7a..cb0857d41e6 100644
--- a/source/blender/editors/armature/reeb.c
+++ b/source/blender/editors/armature/reeb.c
@@ -1175,7 +1175,7 @@ void postprocessGraph(ReebGraph *rg, char mode)
 		fac2 = 0.5f;
 		break;
 	case SKGEN_SHARPEN:
-		fac1 = fac2 = -0.25f;
+		fac1 = fac3 = -0.25f;
 		fac2 = 1.5f;
 		break;
 	default:
diff --git a/source/blender/editors/interface/interface_draw.c b/source/blender/editors/interface/interface_draw.c
index 56f7fd04080..d79bc7d2974 100644
--- a/source/blender/editors/interface/interface_draw.c
+++ b/source/blender/editors/interface/interface_draw.c
@@ -1461,19 +1461,21 @@ void ui_draw_but_CURVE(ARegion *ar, uiBut *but, uiWidgetColors *wcol, rcti *rect
 	fdrawbox(rect->xmin, rect->ymin, rect->xmax, rect->ymax);
 }
 
-static ImBuf *scale_trackpreview_ibuf(ImBuf *ibuf, float zoomx, float zoomy)
+static ImBuf *scale_trackpreview_ibuf(ImBuf *ibuf, float track_pos[2], int width, float height, int margin)
 {
 	ImBuf *scaleibuf;
-	int x, y, w= ibuf->x*zoomx, h= ibuf->y*zoomy;
-	const float scalex= 1.0f/zoomx;
-	const float scaley= 1.0f/zoomy;
+	const float scalex= ((float)ibuf->x-2*margin) / width;
+	const float scaley= ((float)ibuf->y-2*margin) / height;
+	float off_x= (int)track_pos[0]-track_pos[0]+0.5f;
+	float off_y= (int)track_pos[1]-track_pos[1]+0.5f;
+	int x, y;
 
-	scaleibuf= IMB_allocImBuf(w, h, 32, IB_rect);
+	scaleibuf= IMB_allocImBuf(width, height, 32, IB_rect);
 
-	for(y= 0; y<h; y++) {
-		for (x= 0; x<w; x++) {
-			float src_x= scalex*x;
-			float src_y= scaley*y;
+	for(y= 0; y<height; y++) {
+		for (x= 0; x<width; x++) {
+			float src_x= scalex*(x)+margin-off_x;
+			float src_y= scaley*(y)+margin-off_y;
 
 			bicubic_interpolation(ibuf, scaleibuf, src_x, src_y, x, y);
 		}
@@ -1504,7 +1506,7 @@ void ui_draw_but_TRACKPREVIEW(ARegion *ar, uiBut *but, uiWidgetColors *UNUSED(wc
 	if(scopes->track_disabled) {
 		glColor4f(0.7f, 0.3f, 0.3f, 0.3f);
 		uiSetRoundBox(15);
-		uiDrawBox(GL_POLYGON, rect.xmin-1, rect.ymin-1, rect.xmax+1, rect.ymax+1, 3.0f);
+		uiDrawBox(GL_POLYGON, rect.xmin-1, rect.ymin, rect.xmax+1, rect.ymax+1, 3.0f);
 
 		ok= 1;
 	}
@@ -1512,8 +1514,8 @@ void ui_draw_but_TRACKPREVIEW(ARegion *ar, uiBut *but, uiWidgetColors *UNUSED(wc
 		/* additional margin around image */
 		/* NOTE: should be kept in sync with value from BKE_movieclip_update_scopes */
 		const int margin= 3;
-		float zoomx, zoomy, track_pos[2], off_x, off_y, x0, y0;
-		int a;
+		float zoomx, zoomy, track_pos[2], off_x, off_y;
+		int a, width, height;
 		ImBuf *drawibuf;
 
 		glPushMatrix();
@@ -1524,16 +1526,18 @@ void ui_draw_but_TRACKPREVIEW(ARegion *ar, uiBut *but, uiWidgetColors *UNUSED(wc
 		/* draw content of pattern area */
 		glScissor(ar->winrct.xmin+rect.xmin, ar->winrct.ymin+rect.ymin, scissor[2], scissor[3]);
 
-		zoomx= (rect.xmax-rect.xmin) / (scopes->track_preview->x-2*margin);
-		zoomy= (rect.ymax-rect.ymin) / (scopes->track_preview->y-2*margin);
+		width= rect.xmax-rect.xmin+1;
+		height = rect.ymax-rect.ymin;
+
+		zoomx= (float)width / (scopes->track_preview->x-2*margin);
+		zoomy= (float)height / (scopes->track_preview->y-2*margin);
 
 		off_x= ((int)track_pos[0]-track_pos[0]+0.5)*zoomx;
 		off_y= ((int)track_pos[1]-track_pos[1]+0.5)*zoomy;
-		x0= (int)(off_x+rect.xmin-zoomx*(margin-0.5f))+1;
-		y0= (int)(off_y+rect.ymin-zoomy*(margin-0.5f))+1;
 
-		drawibuf= scale_trackpreview_ibuf(scopes->track_preview, zoomx, zoomy);
-		glaDrawPixelsSafe(x0, y0, rect.xmax-x0+1, rect.ymax-y0+1,
+		drawibuf= scale_trackpreview_ibuf(scopes->track_preview, track_pos, width, height, margin);
+
+		glaDrawPixelsSafe(rect.xmin, rect.ymin+1, drawibuf->x, drawibuf->y,
 		                  drawibuf->x, GL_RGBA, GL_UNSIGNED_BYTE, drawibuf->rect);
 		IMB_freeImBuf(drawibuf);
 
@@ -1568,7 +1572,7 @@ void ui_draw_but_TRACKPREVIEW(ARegion *ar, uiBut *but, uiWidgetColors *UNUSED(wc
 	if(!ok) {
 		glColor4f(0.f, 0.f, 0.f, 0.3f);
 		uiSetRoundBox(15);
-		uiDrawBox(GL_POLYGON, rect.xmin-1, rect.ymin-1, rect.xmax+1, rect.ymax+1, 3.0f);
+		uiDrawBox(GL_POLYGON, rect.xmin-1, rect.ymin, rect.xmax+1, rect.ymax+1, 3.0f);
 	}
 
 	/* outline, scale gripper */
diff --git a/source/blender/editors/space_clip/clip_draw.c b/source/blender/editors/space_clip/clip_draw.c
index eb8f30b6739..a331703690b 100644
--- a/source/blender/editors/space_clip/clip_draw.c
+++ b/source/blender/editors/space_clip/clip_draw.c
@@ -777,7 +777,9 @@ static void draw_marker_texts(SpaceClip *sc, MovieTrackingTrack *track, MovieTra
 		else UI_ThemeColor(TH_SEL_MARKER);
 	}
 
-	if(sc->flag&SC_SHOW_MARKER_SEARCH) {
+	if((sc->flag&SC_SHOW_MARKER_SEARCH) &&
+	   ((marker->flag&MARKER_DISABLED)==0 || (sc->flag&SC_SHOW_MARKER_PATTERN)==0))
+	{
 		dx= track->search_min[0];
 		dy= track->search_min[1];
 	} else if(sc->flag&SC_SHOW_MARKER_PATTERN) {
diff --git a/source/blender/editors/space_clip/tracking_ops.c b/source/blender/editors/space_clip/tracking_ops.c
index 7fcd761fc49..f21b50ec592 100644
--- a/source/blender/editors/space_clip/tracking_ops.c
+++ b/source/blender/editors/space_clip/tracking_ops.c
@@ -1014,6 +1014,7 @@ static int select_all_exec(bContext *C, wmOperator *op)
 	SpaceClip *sc= CTX_wm_space_clip(C);
 	MovieClip *clip= ED_space_clip(sc);
 	MovieTrackingTrack *track= NULL;	/* selected track */
+	MovieTrackingMarker *marker;
 	ListBase *tracksbase= BKE_tracking_get_tracks(&clip->tracking);
 	int action= RNA_enum_get(op->ptr, "action");
 	int framenr= sc->user.framenr;
@@ -1024,8 +1025,12 @@ static int select_all_exec(bContext *C, wmOperator *op)
 		track= tracksbase->first;
 		while(track) {
 			if(TRACK_VIEW_SELECTED(sc, track)) {
-				action= SEL_DESELECT;
-				break;
+				marker= BKE_tracking_get_marker(track, framenr);
+
+				if(MARKER_VISIBLE(sc, marker)) {
+					action= SEL_DESELECT;
+					break;
+				}
 			}
 
 			track= track->next;
@@ -1035,9 +1040,9 @@ static int select_all_exec(bContext *C, wmOperator *op)
 	track= tracksbase->first;
 	while(track) {
 		if((track->flag&TRACK_HIDDEN)==0) {
-			MovieTrackingMarker *marker= BKE_tracking_get_marker(track, framenr);
+			marker= BKE_tracking_get_marker(track, framenr);
 
-			if(marker && MARKER_VISIBLE(sc, marker)) {
+			if(MARKER_VISIBLE(sc, marker)) {
 				switch (action) {
 					case SEL_SELECT:
 						track->flag|= SELECT;
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 6b13951348a..1f42118dbc0 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -202,25 +202,34 @@ typedef struct SceneRenderLayer {
 #define SCE_LAY_NEG_ZMASK	0x80000
 
 /* srl->passflag */
-#define SCE_PASS_COMBINED		(1<<0)
-#define SCE_PASS_Z				(1<<1)
-#define SCE_PASS_RGBA			(1<<2)
-#define SCE_PASS_DIFFUSE		(1<<3)
-#define SCE_PASS_SPEC			(1<<4)
-#define SCE_PASS_SHADOW			(1<<5)
-#define SCE_PASS_AO				(1<<6)
-#define SCE_PASS_REFLECT		(1<<7)
-#define SCE_PASS_NORMAL			(1<<8)
-#define SCE_PASS_VECTOR			(1<<9)
-#define SCE_PASS_REFRACT		(1<<10)
-#define SCE_PASS_INDEXOB		(1<<11)
-#define SCE_PASS_UV				(1<<12)
-#define SCE_PASS_INDIRECT		(1<<13)
-#define SCE_PASS_MIST			(1<<14)
-#define SCE_PASS_RAYHITS		(1<<15)
-#define SCE_PASS_EMIT			(1<<16)
-#define SCE_PASS_ENVIRONMENT	(1<<17)
-#define SCE_PASS_INDEXMA	(1<<18)
+#define SCE_PASS_COMBINED			(1<<0)
+#define SCE_PASS_Z					(1<<1)
+#define SCE_PASS_RGBA				(1<<2)
+#define SCE_PASS_DIFFUSE			(1<<3)
+#define SCE_PASS_SPEC				(1<<4)
+#define SCE_PASS_SHADOW				(1<<5)
+#define SCE_PASS_AO					(1<<6)
+#define SCE_PASS_REFLECT			(1<<7)
+#define SCE_PASS_NORMAL				(1<<8)
+#define SCE_PASS_VECTOR				(1<<9)
+#define SCE_PASS_REFRACT			(1<<10)
+#define SCE_PASS_INDEXOB			(1<<11)
+#define SCE_PASS_UV					(1<<12)
+#define SCE_PASS_INDIRECT			(1<<13)
+#define SCE_PASS_MIST				(1<<14)
+#define SCE_PASS_RAYHITS			(1<<15)
+#define SCE_PASS_EMIT				(1<<16)
+#define SCE_PASS_ENVIRONMENT		(1<<17)
+#define SCE_PASS_INDEXMA			(1<<18)
+#define SCE_PASS_DIFFUSE_DIRECT		(1<<19)
+#define SCE_PASS_DIFFUSE_INDIRECT	(1<<20)
+#define SCE_PASS_DIFFUSE_COLOR		(1<<21)
+#define SCE_PASS_GLOSSY_DIRECT		(1<<22)
+#define SCE_PASS_GLOSSY_INDIRECT	(1<<23)
+#define SCE_PASS_GLOSSY_COLOR		(1<<24)
+#define SCE_PASS_TRANSM_DIRECT		(1<<25)
+#define SCE_PASS_TRANSM_INDIRECT	(1<<26)
+#define SCE_PASS_TRANSM_COLOR		(1<<27)
 
 /* note, srl->passflag is treestore element 'nr' in outliner, short still... */
 
diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c
index 7d366afd3ca..3dc0e7c37e4 100644
--- a/source/blender/makesrna/intern/rna_access.c
+++ b/source/blender/makesrna/intern/rna_access.c
@@ -3979,6 +3979,8 @@ static char *rna_idp_path(PointerRNA *ptr, IDProperty *haystack, IDProperty *nee
 								}
 							}
 						}
+						if(path)
+							break;
 					}
 				}
 			}
diff --git a/source/blender/makesrna/intern/rna_render.c b/source/blender/makesrna/intern/rna_render.c
index f00b97994d5..b88e452588e 100644
--- a/source/blender/makesrna/intern/rna_render.c
+++ b/source/blender/makesrna/intern/rna_render.c
@@ -472,6 +472,15 @@ static void rna_def_render_pass(BlenderRNA *brna)
 		{SCE_PASS_EMIT, "EMIT", 0, "Emit", ""},
 		{SCE_PASS_ENVIRONMENT, "ENVIRONMENT", 0, "Environment", ""},
 		{SCE_PASS_INDEXMA, "MATERIAL_INDEX", 0, "Material Index", ""},
+		{SCE_PASS_DIFFUSE_DIRECT, "DIFFUSE_DIRECT", 0, "Diffuse Direct", ""},
+		{SCE_PASS_DIFFUSE_INDIRECT, "DIFFUSE_INDIRECT", 0, "Diffuse Indirect", ""},
+		{SCE_PASS_DIFFUSE_COLOR, "DIFFUSE_COLOR", 0, "Diffuse Color", ""},
+		{SCE_PASS_GLOSSY_DIRECT, "GLOSSY_DIRECT", 0, "Glossy Direct", ""},
+		{SCE_PASS_GLOSSY_INDIRECT, "GLOSSY_INDIRECT", 0, "Glossy Indirect", ""},
+		{SCE_PASS_GLOSSY_COLOR, "GLOSSY_COLOR", 0, "Glossy Color", ""},
+		{SCE_PASS_TRANSM_DIRECT, "TRANSMISSION_DIRECT", 0, "Transmission Direct", ""},
+		{SCE_PASS_TRANSM_INDIRECT, "TRANSMISSION_INDIRECT", 0, "Transmission Indirect", ""},
+		{SCE_PASS_TRANSM_COLOR, "TRANSMISSION_COLOR", 0, "Transmission Color", ""},
 		{0, NULL, 0, NULL, NULL}};
 	
 	srna= RNA_def_struct(brna, "RenderPass", NULL);
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index a3712d17938..34764c30e97 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -2067,6 +2067,60 @@ void rna_def_render_layer_common(StructRNA *srna, int scene)
 	RNA_def_property_ui_icon(prop, ICON_RESTRICT_RENDER_OFF, 1);
 	if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update");
 	else RNA_def_property_clear_flag(prop, PROP_EDITABLE);
+
+	prop= RNA_def_property(srna, "use_pass_diffuse_direct", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_DIFFUSE_DIRECT);
+	RNA_def_property_ui_text(prop, "Diffuse Direct", "Deliver diffuse direct pass");
+	if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update");
+	else RNA_def_property_clear_flag(prop, PROP_EDITABLE);
+
+	prop= RNA_def_property(srna, "use_pass_diffuse_indirect", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_DIFFUSE_INDIRECT);
+	RNA_def_property_ui_text(prop, "Diffuse Indirect", "Deliver diffuse indirect pass");
+	if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update");
+	else RNA_def_property_clear_flag(prop, PROP_EDITABLE);
+
+	prop= RNA_def_property(srna, "use_pass_diffuse_color", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_DIFFUSE_COLOR);
+	RNA_def_property_ui_text(prop, "Diffuse Color", "Deliver diffuse color pass");
+	if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update");
+	else RNA_def_property_clear_flag(prop, PROP_EDITABLE);
+
+	prop= RNA_def_property(srna, "use_pass_glossy_direct", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_GLOSSY_DIRECT);
+	RNA_def_property_ui_text(prop, "Glossy Direct", "Deliver glossy direct pass");
+	if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update");
+	else RNA_def_property_clear_flag(prop, PROP_EDITABLE);
+
+	prop= RNA_def_property(srna, "use_pass_glossy_indirect", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_GLOSSY_INDIRECT);
+	RNA_def_property_ui_text(prop, "Glossy Indirect", "Deliver glossy indirect pass");
+	if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update");
+	else RNA_def_property_clear_flag(prop, PROP_EDITABLE);
+
+	prop= RNA_def_property(srna, "use_pass_glossy_color", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_GLOSSY_COLOR);
+	RNA_def_property_ui_text(prop, "Glossy Color", "Deliver glossy color pass");
+	if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update");
+	else RNA_def_property_clear_flag(prop, PROP_EDITABLE);
+
+	prop= RNA_def_property(srna, "use_pass_transmission_direct", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_TRANSM_DIRECT);
+	RNA_def_property_ui_text(prop, "Transmission Direct", "Deliver transmission direct pass");
+	if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update");
+	else RNA_def_property_clear_flag(prop, PROP_EDITABLE);
+
+	prop= RNA_def_property(srna, "use_pass_transmission_indirect", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_TRANSM_INDIRECT);
+	RNA_def_property_ui_text(prop, "Transmission Indirect", "Deliver transmission indirect pass");
+	if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update");
+	else RNA_def_property_clear_flag(prop, PROP_EDITABLE);
+
+	prop= RNA_def_property(srna, "use_pass_transmission_color", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_TRANSM_COLOR);
+	RNA_def_property_ui_text(prop, "Transmission Color", "Deliver transmission color pass");
+	if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update");
+	else RNA_def_property_clear_flag(prop, PROP_EDITABLE);
 }
 
 static void rna_def_scene_game_recast_data(BlenderRNA *brna)
diff --git a/source/blender/nodes/composite/node_composite_tree.c b/source/blender/nodes/composite/node_composite_tree.c
index 93456d39c9c..dfc0bcb3f75 100644
--- a/source/blender/nodes/composite/node_composite_tree.c
+++ b/source/blender/nodes/composite/node_composite_tree.c
@@ -694,7 +694,28 @@ static void force_hidden_passes(bNode *node, int passflag)
 	if(!(passflag & SCE_PASS_EMIT)) sock->flag |= SOCK_UNAVAIL;
 	sock= BLI_findlink(&node->outputs, RRES_OUT_ENV);
 	if(!(passflag & SCE_PASS_ENVIRONMENT)) sock->flag |= SOCK_UNAVAIL;
-	
+
+	sock= BLI_findlink(&node->outputs, RRES_OUT_DIFF_DIRECT);
+	if(!(passflag & SCE_PASS_DIFFUSE_DIRECT)) sock->flag |= SOCK_UNAVAIL;
+	sock= BLI_findlink(&node->outputs, RRES_OUT_DIFF_INDIRECT);
+	if(!(passflag & SCE_PASS_DIFFUSE_INDIRECT)) sock->flag |= SOCK_UNAVAIL;
+	sock= BLI_findlink(&node->outputs, RRES_OUT_DIFF_COLOR);
+	if(!(passflag & SCE_PASS_DIFFUSE_COLOR)) sock->flag |= SOCK_UNAVAIL;
+
+	sock= BLI_findlink(&node->outputs, RRES_OUT_GLOSSY_DIRECT);
+	if(!(passflag & SCE_PASS_GLOSSY_DIRECT)) sock->flag |= SOCK_UNAVAIL;
+	sock= BLI_findlink(&node->outputs, RRES_OUT_GLOSSY_INDIRECT);
+	if(!(passflag & SCE_PASS_GLOSSY_INDIRECT)) sock->flag |= SOCK_UNAVAIL;
+	sock= BLI_findlink(&node->outputs, RRES_OUT_GLOSSY_COLOR);
+	if(!(passflag & SCE_PASS_GLOSSY_COLOR)) sock->flag |= SOCK_UNAVAIL;
+
+	sock= BLI_findlink(&node->outputs, RRES_OUT_TRANSM_DIRECT);
+	if(!(passflag & SCE_PASS_TRANSM_DIRECT)) sock->flag |= SOCK_UNAVAIL;
+	sock= BLI_findlink(&node->outputs, RRES_OUT_TRANSM_INDIRECT);
+	if(!(passflag & SCE_PASS_TRANSM_INDIRECT)) sock->flag |= SOCK_UNAVAIL;
+	sock= BLI_findlink(&node->outputs, RRES_OUT_TRANSM_COLOR);
+	if(!(passflag & SCE_PASS_TRANSM_COLOR)) sock->flag |= SOCK_UNAVAIL;
+	sock= BLI_findlink(&node->outputs, RRES_OUT_TRANSM_COLOR);
 }
 
 /* based on rules, force sockets hidden always */
diff --git a/source/blender/nodes/composite/nodes/node_composite_image.c b/source/blender/nodes/composite/nodes/node_composite_image.c
index 57b5cec4256..997bd72d5c4 100644
--- a/source/blender/nodes/composite/nodes/node_composite_image.c
+++ b/source/blender/nodes/composite/nodes/node_composite_image.c
@@ -36,25 +36,34 @@
 /* **************** IMAGE (and RenderResult, multilayer image) ******************** */
 
 static bNodeSocketTemplate cmp_node_rlayers_out[]= {
-	{	SOCK_RGBA, 0, "Image",		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_FLOAT, 0, "Alpha",		1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_FLOAT, 0, "Z",			1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_VECTOR, 0, "Normal",	0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_VECTOR, 0, "UV",		1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_VECTOR, 0, "Speed",	1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_RGBA, 0, "Color",		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_RGBA, 0, "Diffuse",	0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_RGBA, 0, "Specular",	0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_RGBA, 0, "Shadow",		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_RGBA, 0, "AO",			0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_RGBA, 0, "Reflect",	0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_RGBA, 0, "Refract",	0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_RGBA, 0, "Indirect",	0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_FLOAT, 0, "IndexOB",	0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_FLOAT, 0, "IndexMA",	0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_FLOAT, 0, "Mist",		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_RGBA, 0, "Emit",		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_RGBA, 0, "Environment",0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA, 0, "Image",					0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_FLOAT, 0, "Alpha",					1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_FLOAT, 0, "Z",						1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_VECTOR, 0, "Normal",				0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_VECTOR, 0, "UV",					1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_VECTOR, 0, "Speed",				1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA, 0, "Color",					0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA, 0, "Diffuse",				0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA, 0, "Specular",				0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA, 0, "Shadow",					0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA, 0, "AO",						0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA, 0, "Reflect",				0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA, 0, "Refract",				0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA, 0, "Indirect",				0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_FLOAT, 0, "IndexOB",				0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_FLOAT, 0, "IndexMA",				0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_FLOAT, 0, "Mist",					0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA, 0, "Emit",					0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA, 0, "Environment",			0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA, 0, "Diffuse Direct",			0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA, 0, "Diffuse Indirect",		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA, 0, "Diffuse Color",			0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA, 0, "Glossy Direct",			0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA, 0, "Glossy Indirect",		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA, 0, "Glossy Color",			0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA, 0, "Transmission Direct",	0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA, 0, "Transmission Indirect",	0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+	{	SOCK_RGBA, 0, "Transmission Color",		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
 	{	-1, 0, ""	}
 };
 
@@ -238,6 +247,24 @@ static void outputs_multilayer_get(RenderData *rd, RenderLayer *rl, bNodeStack *
 		out[RRES_OUT_EMIT]->data= compbuf_multilayer_get(rd, rl, ima, iuser, SCE_PASS_EMIT);
 	if(out[RRES_OUT_ENV]->hasoutput)
 		out[RRES_OUT_ENV]->data= compbuf_multilayer_get(rd, rl, ima, iuser, SCE_PASS_ENVIRONMENT);
+	if(out[RRES_OUT_DIFF_DIRECT]->hasoutput)
+		out[RRES_OUT_DIFF_DIRECT]->data= compbuf_multilayer_get(rd, rl, ima, iuser, SCE_PASS_DIFFUSE_DIRECT);
+	if(out[RRES_OUT_DIFF_INDIRECT]->hasoutput)
+		out[RRES_OUT_DIFF_INDIRECT]->data= compbuf_multilayer_get(rd, rl, ima, iuser, SCE_PASS_DIFFUSE_INDIRECT);
+	if(out[RRES_OUT_DIFF_COLOR]->hasoutput)
+		out[RRES_OUT_DIFF_COLOR]->data= compbuf_multilayer_get(rd, rl, ima, iuser, SCE_PASS_DIFFUSE_COLOR);
+	if(out[RRES_OUT_GLOSSY_DIRECT]->hasoutput)
+		out[RRES_OUT_GLOSSY_DIRECT]->data= compbuf_multilayer_get(rd, rl, ima, iuser, SCE_PASS_GLOSSY_DIRECT);
+	if(out[RRES_OUT_GLOSSY_INDIRECT]->hasoutput)
+		out[RRES_OUT_GLOSSY_INDIRECT]->data= compbuf_multilayer_get(rd, rl, ima, iuser, SCE_PASS_GLOSSY_INDIRECT);
+	if(out[RRES_OUT_GLOSSY_COLOR]->hasoutput)
+		out[RRES_OUT_GLOSSY_COLOR]->data= compbuf_multilayer_get(rd, rl, ima, iuser, SCE_PASS_GLOSSY_COLOR);
+	if(out[RRES_OUT_TRANSM_DIRECT]->hasoutput)
+		out[RRES_OUT_TRANSM_DIRECT]->data= compbuf_multilayer_get(rd, rl, ima, iuser, SCE_PASS_TRANSM_DIRECT);
+	if(out[RRES_OUT_TRANSM_INDIRECT]->hasoutput)
+		out[RRES_OUT_TRANSM_INDIRECT]->data= compbuf_multilayer_get(rd, rl, ima, iuser, SCE_PASS_TRANSM_INDIRECT);
+	if(out[RRES_OUT_TRANSM_COLOR]->hasoutput)
+		out[RRES_OUT_TRANSM_COLOR]->data= compbuf_multilayer_get(rd, rl, ima, iuser, SCE_PASS_TRANSM_COLOR);
 }
 
 
@@ -402,6 +429,24 @@ static void node_composit_rlayers_out(RenderData *rd, RenderLayer *rl, bNodeStac
 		out[RRES_OUT_EMIT]->data= compbuf_from_pass(rd, rl, rectx, recty, SCE_PASS_EMIT);
 	if(out[RRES_OUT_ENV]->hasoutput)
 		out[RRES_OUT_ENV]->data= compbuf_from_pass(rd, rl, rectx, recty, SCE_PASS_ENVIRONMENT);
+	if(out[RRES_OUT_DIFF_DIRECT]->hasoutput)
+		out[RRES_OUT_DIFF_DIRECT]->data= compbuf_from_pass(rd, rl, rectx, recty, SCE_PASS_DIFFUSE_DIRECT);
+	if(out[RRES_OUT_DIFF_INDIRECT]->hasoutput)
+		out[RRES_OUT_DIFF_INDIRECT]->data= compbuf_from_pass(rd, rl, rectx, recty, SCE_PASS_DIFFUSE_INDIRECT);
+	if(out[RRES_OUT_DIFF_COLOR]->hasoutput)
+		out[RRES_OUT_DIFF_COLOR]->data= compbuf_from_pass(rd, rl, rectx, recty, SCE_PASS_DIFFUSE_COLOR);
+	if(out[RRES_OUT_GLOSSY_DIRECT]->hasoutput)
+		out[RRES_OUT_GLOSSY_DIRECT]->data= compbuf_from_pass(rd, rl, rectx, recty, SCE_PASS_GLOSSY_DIRECT);
+	if(out[RRES_OUT_GLOSSY_INDIRECT]->hasoutput)
+		out[RRES_OUT_GLOSSY_INDIRECT]->data= compbuf_from_pass(rd, rl, rectx, recty, SCE_PASS_GLOSSY_INDIRECT);
+	if(out[RRES_OUT_GLOSSY_COLOR]->hasoutput)
+		out[RRES_OUT_GLOSSY_COLOR]->data= compbuf_from_pass(rd, rl, rectx, recty, SCE_PASS_GLOSSY_COLOR);
+	if(out[RRES_OUT_TRANSM_DIRECT]->hasoutput)
+		out[RRES_OUT_TRANSM_DIRECT]->data= compbuf_from_pass(rd, rl, rectx, recty, SCE_PASS_TRANSM_DIRECT);
+	if(out[RRES_OUT_TRANSM_INDIRECT]->hasoutput)
+		out[RRES_OUT_TRANSM_INDIRECT]->data= compbuf_from_pass(rd, rl, rectx, recty, SCE_PASS_TRANSM_INDIRECT);
+	if(out[RRES_OUT_TRANSM_COLOR]->hasoutput)
+		out[RRES_OUT_TRANSM_COLOR]->data= compbuf_from_pass(rd, rl, rectx, recty, SCE_PASS_TRANSM_COLOR);
 }
 
 static void node_composit_exec_rlayers(void *data, bNode *node, bNodeStack **UNUSED(in), bNodeStack **out)
diff --git a/source/blender/render/intern/source/render_result.c b/source/blender/render/intern/source/render_result.c
index e825c9d842e..30853e8e1f6 100644
--- a/source/blender/render/intern/source/render_result.c
+++ b/source/blender/render/intern/source/render_result.c
@@ -224,6 +224,60 @@ static const char *get_pass_name(int passtype, int channel)
 		if(channel==1) return "Rayhits.G";
 		return "Rayhits.B";
 	}
+	if(passtype == SCE_PASS_DIFFUSE_DIRECT) {
+		if(channel==-1) return "DiffDir";
+		if(channel==0) return "DiffDir.R";
+		if(channel==1) return "DiffDir.G";
+		return "DiffDir.B";
+	}
+	if(passtype == SCE_PASS_DIFFUSE_INDIRECT) {
+		if(channel==-1) return "DiffInd";
+		if(channel==0) return "DiffInd.R";
+		if(channel==1) return "DiffInd.G";
+		return "DiffInd.B";
+	}
+	if(passtype == SCE_PASS_DIFFUSE_COLOR) {
+		if(channel==-1) return "DiffCol";
+		if(channel==0) return "DiffCol.R";
+		if(channel==1) return "DiffCol.G";
+		return "DiffCol.B";
+	}
+	if(passtype == SCE_PASS_GLOSSY_DIRECT) {
+		if(channel==-1) return "GlossDir";
+		if(channel==0) return "GlossDir.R";
+		if(channel==1) return "GlossDir.G";
+		return "GlossDir.B";
+	}
+	if(passtype == SCE_PASS_GLOSSY_INDIRECT) {
+		if(channel==-1) return "GlossInd";
+		if(channel==0) return "GlossInd.R";
+		if(channel==1) return "GlossInd.G";
+		return "GlossInd.B";
+	}
+	if(passtype == SCE_PASS_GLOSSY_COLOR) {
+		if(channel==-1) return "GlossCol";
+		if(channel==0) return "GlossCol.R";
+		if(channel==1) return "GlossCol.G";
+		return "GlossCol.B";
+	}
+	if(passtype == SCE_PASS_TRANSM_DIRECT) {
+		if(channel==-1) return "TransDir";
+		if(channel==0) return "TransDir.R";
+		if(channel==1) return "TransDir.G";
+		return "TransDir.B";
+	}
+	if(passtype == SCE_PASS_TRANSM_INDIRECT) {
+		if(channel==-1) return "TransInd";
+		if(channel==0) return "TransInd.R";
+		if(channel==1) return "TransInd.G";
+		return "TransInd.B";
+	}
+	if(passtype == SCE_PASS_TRANSM_COLOR) {
+		if(channel==-1) return "TransCol";
+		if(channel==0) return "TransCol.R";
+		if(channel==1) return "TransCol.G";
+		return "TransCol.B";
+	}
 	return "Unknown";
 }
 
@@ -286,6 +340,34 @@ static int passtype_from_name(const char *str)
 	
 	if(strcmp(str, "RayHits")==0)
 		return SCE_PASS_RAYHITS;
+
+	if(strcmp(str, "DiffDir")==0)
+		return SCE_PASS_DIFFUSE_DIRECT;
+
+	if(strcmp(str, "DiffInd")==0)
+		return SCE_PASS_DIFFUSE_INDIRECT;
+
+	if(strcmp(str, "DiffCol")==0)
+		return SCE_PASS_DIFFUSE_COLOR;
+
+	if(strcmp(str, "GlossDir")==0)
+		return SCE_PASS_GLOSSY_DIRECT;
+
+	if(strcmp(str, "GlossInd")==0)
+		return SCE_PASS_GLOSSY_INDIRECT;
+
+	if(strcmp(str, "GlossCol")==0)
+		return SCE_PASS_GLOSSY_COLOR;
+
+	if(strcmp(str, "TransDir")==0)
+		return SCE_PASS_TRANSM_DIRECT;
+
+	if(strcmp(str, "TransInd")==0)
+		return SCE_PASS_TRANSM_INDIRECT;
+
+	if(strcmp(str, "TransCol")==0)
+		return SCE_PASS_TRANSM_COLOR;
+
 	return 0;
 }
 
@@ -430,6 +512,24 @@ RenderResult *render_result_new(Render *re, rcti *partrct, int crop, int savebuf
 			render_layer_add_pass(rr, rl, 1, SCE_PASS_MIST);
 		if(rl->passflag & SCE_PASS_RAYHITS)
 			render_layer_add_pass(rr, rl, 4, SCE_PASS_RAYHITS);
+		if(srl->passflag  & SCE_PASS_DIFFUSE_DIRECT)
+			render_layer_add_pass(rr, rl, 3, SCE_PASS_DIFFUSE_DIRECT);
+		if(srl->passflag  & SCE_PASS_DIFFUSE_INDIRECT)
+			render_layer_add_pass(rr, rl, 3, SCE_PASS_DIFFUSE_INDIRECT);
+		if(srl->passflag  & SCE_PASS_DIFFUSE_COLOR)
+			render_layer_add_pass(rr, rl, 3, SCE_PASS_DIFFUSE_COLOR);
+		if(srl->passflag  & SCE_PASS_GLOSSY_DIRECT)
+			render_layer_add_pass(rr, rl, 3, SCE_PASS_GLOSSY_DIRECT);
+		if(srl->passflag  & SCE_PASS_GLOSSY_INDIRECT)
+			render_layer_add_pass(rr, rl, 3, SCE_PASS_GLOSSY_INDIRECT);
+		if(srl->passflag  & SCE_PASS_GLOSSY_COLOR)
+			render_layer_add_pass(rr, rl, 3, SCE_PASS_GLOSSY_COLOR);
+		if(srl->passflag  & SCE_PASS_TRANSM_DIRECT)
+			render_layer_add_pass(rr, rl, 3, SCE_PASS_TRANSM_DIRECT);
+		if(srl->passflag  & SCE_PASS_TRANSM_INDIRECT)
+			render_layer_add_pass(rr, rl, 3, SCE_PASS_TRANSM_INDIRECT);
+		if(srl->passflag  & SCE_PASS_TRANSM_COLOR)
+			render_layer_add_pass(rr, rl, 3, SCE_PASS_TRANSM_COLOR);
 		
 	}
 	/* sss, previewrender and envmap don't do layers, so we make a default one */