[Bf-blender-cvs] [0dc2306] soc-2016-cycles_denoising: Cycles: Fix Denoising Pass detection when loading Multilayer EXRs

[Lukas Stockner]

Commit: 0dc23065e26f00e7f7be772c1221c3e4dafefdbe
Author: Lukas Stockner
Date:   Sat Oct 1 23:30:58 2016 +0200
Branches: soc-2016-cycles_denoising
https://developer.blender.org/rB0dc23065e26f00e7f7be772c1221c3e4dafefdbe

Cycles: Fix Denoising Pass detection when loading Multilayer EXRs

===================================================================

M	source/blender/render/intern/source/render_result.c

===================================================================

diff --git a/source/blender/render/intern/source/render_result.c b/source/blender/render/intern/source/render_result.c
index c23fa03..d2f3814 100644
--- a/source/blender/render/intern/source/render_result.c
+++ b/source/blender/render/intern/source/render_result.c
@@ -535,37 +535,37 @@ static uint64_t passtype_from_name(const char *str, uint64_t passflag)
 		RETURN_PASS(SCE_PASS_SUBSURFACE_COLOR);
 
 	if (STRPREFIX(str, "DenoiseNormal"))
-		return SCE_PASS_DENOISE_NORMAL;
+		RETURN_PASS(SCE_PASS_DENOISE_NORMAL);
 
 	if (STRPREFIX(str, "DenoiseNormalVar"))
-		return SCE_PASS_DENOISE_NORMAL_VAR;
+		RETURN_PASS(SCE_PASS_DENOISE_NORMAL_VAR);
 
 	if (STRPREFIX(str, "DenoiseAlbedo"))
-		return SCE_PASS_DENOISE_ALBEDO;
+		RETURN_PASS(SCE_PASS_DENOISE_ALBEDO);
 
 	if (STRPREFIX(str, "DenoiseAlbedoVar"))
-		return SCE_PASS_DENOISE_ALBEDO_VAR;
+		RETURN_PASS(SCE_PASS_DENOISE_ALBEDO_VAR);
 
 	if (STRPREFIX(str, "DenoiseDepth"))
-		return SCE_PASS_DENOISE_DEPTH;
+		RETURN_PASS(SCE_PASS_DENOISE_DEPTH);
 
 	if (STRPREFIX(str, "DenoiseDepthVar"))
-		return SCE_PASS_DENOISE_DEPTH_VAR;
+		RETURN_PASS(SCE_PASS_DENOISE_DEPTH_VAR);
 
 	if (STRPREFIX(str, "DenoiseShadowA"))
-		return SCE_PASS_DENOISE_SHADOW_A;
+		RETURN_PASS(SCE_PASS_DENOISE_SHADOW_A);
 
 	if (STRPREFIX(str, "DenoiseShadowB"))
-		return SCE_PASS_DENOISE_SHADOW_B;
+		RETURN_PASS(SCE_PASS_DENOISE_SHADOW_B);
 
 	if (STRPREFIX(str, "DenoiseNoisy"))
-		return SCE_PASS_DENOISE_NOISY;
+		RETURN_PASS(SCE_PASS_DENOISE_NOISY);
 
 	if (STRPREFIX(str, "DenoiseNoisyVar"))
-		return SCE_PASS_DENOISE_NOISY_VAR;
+		RETURN_PASS(SCE_PASS_DENOISE_NOISY_VAR);
 
 	if (STRPREFIX(str, "DenoiseClean"))
-		return SCE_PASS_DENOISE_CLEAN;
+		RETURN_PASS(SCE_PASS_DENOISE_CLEAN);
 
 	if (STRPREFIX(str, "DenoiseNoisyB"))
 		return SCE_PASS_DENOISE_NOISY_B;