diff options
| author | Jeroen Bakker <j.bakker@atmind.nl> | 2018-05-11 17:55:14 +0300 |
|---|---|---|
| committer | Jeroen Bakker <j.bakker@atmind.nl> | 2018-05-11 18:02:13 +0300 |
| commit | d3c4248946f65d287f18b3d6488cd450dfb6d81d (patch) | |
| tree | 47ed70266631c5e40cf221031d84315d85f27983 /source/blender/windowmanager | |
| parent | 68b736ce248fbfc6eacfa2fed4f677523087accb (diff) | |
Workbench: StudioLight HDRI's
The Studio lights are now loaded from disk. The location is
`datafiles/studiolights` they need to be JPG for now. JPG cannot store
HDRI color range but they are clamped inside the Workbench
engine for speed reason. I didn't select JP2K as it might not be
enabled.
Users can add upto 20 HDRI files. This limitation is inside the
RNA_space.c Currently the icons are calculated when you first open the
selection box for the HDRI's. We could add them to a background
rendering later.
I added 2 test files a sky texture rendered in Cycles and an HDRI from
cloud.blender.org.
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_init_exit.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c index 5813fc95e13..1dd2185b982 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.c +++ b/source/blender/windowmanager/intern/wm_init_exit.c @@ -75,6 +75,7 @@ #include "BKE_addon.h" #include "BKE_appdir.h" #include "BKE_sequencer.h" /* free seq clipboard */ +#include "BKE_studiolight.h" #include "BKE_material.h" /* clear_matcopybuf */ #include "BKE_tracking.h" /* free tracking clipboard */ #include "BKE_mask.h" /* free mask clipboard */ @@ -250,6 +251,7 @@ void WM_init(bContext *C, int argc, const char **argv) WM_init_opengl(); UI_init(); + BKE_studiolight_init(); } else { /* Note: Currently only inits icons, which we now want in background mode too @@ -259,7 +261,6 @@ void WM_init(bContext *C, int argc, const char **argv) BKE_icons_init(1); } - ED_spacemacros_init(); /* note: there is a bug where python needs initializing before loading the @@ -513,6 +514,7 @@ void WM_exit_ext(bContext *C, const bool do_python) GPU_pass_cache_free(); DRW_opengl_context_destroy(); } + BKE_studiolight_free(); #ifdef WITH_INTERNATIONAL BLF_free_unifont(); |