[Bf-blender-cvs] [b6b7c83dd8e] blender2.8: StudioLight: Only apply windowing when SH level is 2

Jeroen Bakker noreply at git.blender.org
Fri Jun 22 12:37:56 CEST 2018


Commit: b6b7c83dd8e4838d4819c25d95dd01cacf81c8d8
Author: Jeroen Bakker
Date:   Fri Jun 22 12:37:03 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBb6b7c83dd8e4838d4819c25d95dd01cacf81c8d8

StudioLight: Only apply windowing when SH level is 2

It does not make much sense for the other levels

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

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

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

diff --git a/source/blender/blenkernel/BKE_studiolight.h b/source/blender/blenkernel/BKE_studiolight.h
index 9e6856f9990..3873ad288f5 100644
--- a/source/blender/blenkernel/BKE_studiolight.h
+++ b/source/blender/blenkernel/BKE_studiolight.h
@@ -65,18 +65,16 @@
 #define STUDIOLIGHT_SPHERICAL_HARMONICS_MAX_COMPONENTS 9
 
 #if STUDIOLIGHT_SPHERICAL_HARMONICS_LEVEL == 0
-#define STUDIOLIGHT_SPHERICAL_HARMONICS_COMPONENTS 1
-#define STUDIOLIGHT_SPHERICAL_HARMONICS_WINDOWING_TARGET_LAMPLACIAN 10.0f
+#  define STUDIOLIGHT_SPHERICAL_HARMONICS_COMPONENTS 1
 #endif
 
 #if STUDIOLIGHT_SPHERICAL_HARMONICS_LEVEL == 1
-#define STUDIOLIGHT_SPHERICAL_HARMONICS_COMPONENTS 4
-#define STUDIOLIGHT_SPHERICAL_HARMONICS_WINDOWING_TARGET_LAMPLACIAN 10.0f
+#  define STUDIOLIGHT_SPHERICAL_HARMONICS_COMPONENTS 4
 #endif
 
 #if STUDIOLIGHT_SPHERICAL_HARMONICS_LEVEL == 2
-#define STUDIOLIGHT_SPHERICAL_HARMONICS_COMPONENTS 9
-#define STUDIOLIGHT_SPHERICAL_HARMONICS_WINDOWING_TARGET_LAMPLACIAN 10.0f
+#  define STUDIOLIGHT_SPHERICAL_HARMONICS_COMPONENTS 9
+#  define STUDIOLIGHT_SPHERICAL_HARMONICS_WINDOWING_TARGET_LAMPLACIAN 10.0f
 #endif
 
 struct GPUTexture;
diff --git a/source/blender/blenkernel/intern/studiolight.c b/source/blender/blenkernel/intern/studiolight.c
index 063e5dcf2bc..e561db3c141 100644
--- a/source/blender/blenkernel/intern/studiolight.c
+++ b/source/blender/blenkernel/intern/studiolight.c
@@ -73,7 +73,9 @@ static ListBase studiolights;
 // #define STUDIOLIGHT_IRRADIANCE_METHOD STUDIOLIGHT_IRRADIANCE_METHOD_RADIANCE
 #define STUDIOLIGHT_IRRADIANCE_METHOD STUDIOLIGHT_IRRADIANCE_METHOD_SPHERICAL_HARMONICS
 
-#define STUDIOLIGHT_SPHERICAL_HARMONICS_WINDOWING
+#if STUDIOLIGHT_SPHERICAL_HARMONICS_LEVEL == 2
+#  define STUDIOLIGHT_SPHERICAL_HARMONICS_WINDOWING
+#endif
 
 /*
  * Disable this option so caches are not loaded from disk



More information about the Bf-blender-cvs mailing list