Viewport: Change default studiolight

Differential Revision: https://developer.blender.org/D4939

1 files changed, 43 insertions, 43 deletions

diff --git a/source/blender/blenkernel/intern/studiolight.c b/source/blender/blenkernel/intern/studiolight.c
index d0c29e4331b..20f2a9be53b 100644
--- a/source/blender/blenkernel/intern/studiolight.c
+++ b/source/blender/blenkernel/intern/studiolight.c
@@ -1248,55 +1248,55 @@ static void studiolight_irradiance_preview(uint *icon_buffer, StudioLight *sl)
 
 void BKE_studiolight_default(SolidLight lights[4], float light_ambient[4])
 {
-  copy_v3_fl3(light_ambient, 0.025000, 0.025000, 0.025000);
+  copy_v3_fl3(light_ambient, 0.0, 0.0, 0.0);
 
   lights[0].flag = 1;
-  lights[0].smooth = 0.346939;
-  lights[0].col[0] = 0.058834;
-  lights[0].col[1] = 0.058834;
-  lights[0].col[2] = 0.058834;
-  lights[0].spec[0] = 0.084151;
-  lights[0].spec[1] = 0.084151;
-  lights[0].spec[2] = 0.084151;
-  lights[0].vec[0] = 0.182079;
-  lights[0].vec[1] = -0.235631;
-  lights[0].vec[2] = -0.954634;
+  lights[0].smooth = 0.526620f;
+  lights[0].col[0] = 0.033103f;
+  lights[0].col[1] = 0.033103f;
+  lights[0].col[2] = 0.033103f;
+  lights[0].spec[0] = 0.266761f;
+  lights[0].spec[1] = 0.266761f;
+  lights[0].spec[2] = 0.266761f;
+  lights[0].vec[0] = -0.352546f;
+  lights[0].vec[1] = 0.170931f;
+  lights[0].vec[2] = -0.920051f;
 
   lights[1].flag = 1;
-  lights[1].smooth = 0.000000;
-  lights[1].col[0] = 0.498431;
-  lights[1].col[1] = 0.514808;
-  lights[1].col[2] = 0.514808;
-  lights[1].spec[0] = 1.000000;
-  lights[1].spec[1] = 1.000000;
-  lights[1].spec[2] = 1.000000;
-  lights[1].vec[0] = 0.000000;
-  lights[1].vec[1] = 0.530612;
-  lights[1].vec[2] = 0.847615;
+  lights[1].smooth = 0.000000f;
+  lights[1].col[0] = 0.521083f;
+  lights[1].col[1] = 0.538226f;
+  lights[1].col[2] = 0.538226f;
+  lights[1].spec[0] = 0.599030f;
+  lights[1].spec[1] = 0.599030f;
+  lights[1].spec[2] = 0.599030f;
+  lights[1].vec[0] = -0.408163f;
+  lights[1].vec[1] = 0.346939f;
+  lights[1].vec[2] = 0.844415f;
 
   lights[2].flag = 1;
-  lights[2].smooth = 0.277551;
-  lights[2].col[0] = 0.136410;
-  lights[2].col[1] = 0.180357;
-  lights[2].col[2] = 0.149840;
-  lights[2].spec[0] = 0.086273;
-  lights[2].spec[1] = 0.095056;
-  lights[2].spec[2] = 0.061140;
-  lights[2].vec[0] = -0.909747;
-  lights[2].vec[1] = 0.375765;
-  lights[2].vec[2] = -0.176523;
+  lights[2].smooth = 0.478261f;
+  lights[2].col[0] = 0.038403f;
+  lights[2].col[1] = 0.034357f;
+  lights[2].col[2] = 0.049530f;
+  lights[2].spec[0] = 0.106102f;
+  lights[2].spec[1] = 0.125981f;
+  lights[2].spec[2] = 0.158523f;
+  lights[2].vec[0] = 0.521739f;
+  lights[2].vec[1] = 0.826087f;
+  lights[2].vec[2] = 0.212999f;
 
   lights[3].flag = 1;
-  lights[3].smooth = 0.362069;
-  lights[3].col[0] = 0.017977;
-  lights[3].col[1] = 0.011590;
-  lights[3].col[2] = 0.009531;
-  lights[3].spec[0] = 0.486897;
-  lights[3].spec[1] = 0.358628;
-  lights[3].spec[2] = 0.314323;
-  lights[3].vec[0] = 0.913200;
-  lights[3].vec[1] = 0.213080;
-  lights[3].vec[2] = -0.347366;
+  lights[3].smooth = 0.200000f;
+  lights[3].col[0] = 0.090838f;
+  lights[3].col[1] = 0.082080f;
+  lights[3].col[2] = 0.072255f;
+  lights[3].spec[0] = 0.106535f;
+  lights[3].spec[1] = 0.084771f;
+  lights[3].spec[2] = 0.066080f;
+  lights[3].vec[0] = 0.624519f;
+  lights[3].vec[1] = -0.562067f;
+  lights[3].vec[2] = -0.542269f;
 }
 
 /* API */
@@ -1308,8 +1308,6 @@ void BKE_studiolight_init(void)
                                        STUDIOLIGHT_TYPE_STUDIO);
   BLI_strncpy(sl->name, "Default", FILE_MAXFILE);
 
-  BKE_studiolight_default(sl->light, sl->light_ambient);
-
   BLI_addtail(&studiolights, sl);
 
   /* go over the preset folder and add a studiolight for every image with its path */
@@ -1336,6 +1334,8 @@ void BKE_studiolight_init(void)
 
   /* sort studio lights on filename. */
   BLI_listbase_sort(&studiolights, studiolight_cmp);
+
+  BKE_studiolight_default(sl->light, sl->light_ambient);
 }
 
 void BKE_studiolight_free(void)