[Bf-blender-cvs] [8ac8ef8ec7c] blender2.8: Workbench: Studiolights merge error?

Jeroen Bakker noreply at git.blender.org
Wed May 23 08:55:17 CEST 2018


Commit: 8ac8ef8ec7c801d0f3ecf8d2b9dd62c0deafe2ce
Author: Jeroen Bakker
Date:   Wed May 23 08:54:58 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB8ac8ef8ec7c801d0f3ecf8d2b9dd62c0deafe2ce

Workbench: Studiolights merge error?

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

M	source/blender/blenkernel/intern/studiolight.c

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

diff --git a/source/blender/blenkernel/intern/studiolight.c b/source/blender/blenkernel/intern/studiolight.c
index f4884c49271..8086156d3af 100644
--- a/source/blender/blenkernel/intern/studiolight.c
+++ b/source/blender/blenkernel/intern/studiolight.c
@@ -313,6 +313,7 @@ static void studiolight_calculate_irradiance(StudioLight *sl, float color[3], co
 	}
 
 	mul_v3_fl(color, 1.25 / (STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE * STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE));
+	return;
 
 fail:
 	/* Pink color of failure. */



More information about the Bf-blender-cvs mailing list