[Bf-blender-cvs] [3d4c4fd3a7a] master: Viewport: change default 3D viewport lighting from Studio to Matcap

[Brecht Van Lommel]

Commit: 3d4c4fd3a7a9650ffff1d72688097b87e6d28336
Author: Brecht Van Lommel
Date:   Mon May 20 13:55:49 2019 +0200
Branches: master
https://developer.blender.org/rB3d4c4fd3a7a9650ffff1d72688097b87e6d28336

Viewport: change default 3D viewport lighting from Studio to Matcap

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

M	source/blender/blenkernel/intern/screen.c
M	source/blender/blenloader/intern/versioning_defaults.c

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

diff --git a/source/blender/blenkernel/intern/screen.c b/source/blender/blenkernel/intern/screen.c
index bc9ec6b28e6..222e8ddb724 100644
--- a/source/blender/blenkernel/intern/screen.c
+++ b/source/blender/blenkernel/intern/screen.c
@@ -840,7 +840,7 @@ void BKE_screen_view3d_shading_init(View3DShading *shading)
   shading->type = OB_SOLID;
   shading->prev_type = OB_SOLID;
   shading->flag = V3D_SHADING_SPECULAR_HIGHLIGHT | V3D_SHADING_XRAY_BONE;
-  shading->light = V3D_LIGHTING_STUDIO;
+  shading->light = V3D_LIGHTING_MATCAP;
   shading->shadow_intensity = 0.5f;
   shading->xray_alpha = 0.5f;
   shading->xray_alpha_wire = 0.5f;
diff --git a/source/blender/blenloader/intern/versioning_defaults.c b/source/blender/blenloader/intern/versioning_defaults.c
index a517d44fb4e..c55a860f3b4 100644
--- a/source/blender/blenloader/intern/versioning_defaults.c
+++ b/source/blender/blenloader/intern/versioning_defaults.c
@@ -322,6 +322,7 @@ void BLO_update_defaults_startup_blend(Main *bmain, const char *app_template)
           /* Screen space cavity by default for faster performance. */
           View3D *v3d = sa->spacedata.first;
           v3d->shading.cavity_type = V3D_SHADING_CAVITY_CURVATURE;
+          v3d->shading.light = V3D_LIGHTING_MATCAP;
         }
         else if (sa->spacetype == SPACE_CLIP) {
           SpaceClip *sclip = sa->spacedata.first;