From b6b7c83dd8e4838d4819c25d95dd01cacf81c8d8 Mon Sep 17 00:00:00 2001 From: Jeroen Bakker Date: Fri, 22 Jun 2018 12:37:03 +0200 Subject: StudioLight: Only apply windowing when SH level is 2 It does not make much sense for the other levels --- source/blender/blenkernel/BKE_studiolight.h | 10 ++++------ source/blender/blenkernel/intern/studiolight.c | 4 +++- 2 files changed, 7 insertions(+), 7 deletions(-) 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 -- cgit v1.2.3