diff options
| author | Jeroen Bakker <j.bakker@atmind.nl> | 2019-08-27 16:47:30 +0300 |
|---|---|---|
| committer | Jeroen Bakker <j.bakker@atmind.nl> | 2019-09-04 16:57:00 +0300 |
| commit | 68d1f091583168dce4e52d3c7378b9b0359e903a (patch) | |
| tree | 07adc7e5f8f353f4bab9f8cdd6f4fd783a13767c /source/blender/windowmanager/intern/wm_init_exit.c | |
| parent | d3ab930c880e3a15cd7cd46355663e60119f6bde (diff) | |
Shading Modes: Material and Render Preview
This change implements the basics as described in {T68312} for the
shading modes.
* LookDev shading mode is renamed to Material Preview. It always uses Eevee as renderer, and is intended to provide a fast material preview suitable for texture painting, and texture and material setup.
* Rendered shading gains "Use Scene Lights" and "Use Scene World" options similar to current Material Preview. These will be enabled by default. When Use Scene World is turned off, HDRIs will be used for lighting instead. These options are available for EEVEE and Cycles.
* Renderers will be able to customize the shading settings panel and add additional settings.
Reviewed By: brecht, fclem
Differential Revision: https://developer.blender.org/D5612
Diffstat (limited to 'source/blender/windowmanager/intern/wm_init_exit.c')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_init_exit.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c index d08f4e236ee..bdc89f2bf2b 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.c +++ b/source/blender/windowmanager/intern/wm_init_exit.c @@ -288,6 +288,10 @@ void WM_init(bContext *C, int argc, const char **argv) const bool use_data = true; const bool use_userdef = true; + /* Studiolights needs to be init before we read the homefile, otherwise the versioning cannot + * find the default studiolight.*/ + BKE_studiolight_init(); + wm_homefile_read(C, NULL, G.factory_startup, @@ -315,8 +319,6 @@ void WM_init(bContext *C, int argc, const char **argv) UI_init(); } - BKE_studiolight_init(); - ED_spacemacros_init(); /* note: there is a bug where python needs initializing before loading the |