diff options
| author | Philipp Oeser <info@graphics-engineer.com> | 2018-12-03 22:55:36 +0300 |
|---|---|---|
| committer | Philipp Oeser <info@graphics-engineer.com> | 2018-12-05 16:53:44 +0300 |
| commit | 378e5232e88eb99c40025c681c9b28724a370c0f (patch) | |
| tree | d4b47874429cfa15271617b17036ba0679f6e2ff /source/blender/blenkernel/intern/studiolight.c | |
| parent | fb3f1a35676e830358ec68ae8153e076253930b4 (diff) | |
Fix T58104: Duplicated previews for Matcaps/HDRIs in portable installs
Reviewers: brecht
Maniphest Tasks: T58104
Differential Revision: https://developer.blender.org/D4028
Diffstat (limited to 'source/blender/blenkernel/intern/studiolight.c')
| -rw-r--r-- | source/blender/blenkernel/intern/studiolight.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/studiolight.c b/source/blender/blenkernel/intern/studiolight.c index 5196ae50bab..bd8061a2d8e 100644 --- a/source/blender/blenkernel/intern/studiolight.c +++ b/source/blender/blenkernel/intern/studiolight.c @@ -1219,13 +1219,22 @@ void BKE_studiolight_init(void) BLI_addtail(&studiolights, sl); /* go over the preset folder and add a studiolight for every image with its path */ + /* for portable installs (where USER and SYSTEM paths are the same), only go over LOCAL datafiles once */ /* Also reserve icon space for it. */ + if (!BKE_appdir_app_is_portable_install()) { + studiolight_add_files_from_datafolder(BLENDER_USER_DATAFILES, + STUDIOLIGHT_LIGHTS_FOLDER, + STUDIOLIGHT_TYPE_STUDIO | STUDIOLIGHT_USER_DEFINED); + studiolight_add_files_from_datafolder(BLENDER_USER_DATAFILES, + STUDIOLIGHT_WORLD_FOLDER, + STUDIOLIGHT_TYPE_WORLD | STUDIOLIGHT_USER_DEFINED); + studiolight_add_files_from_datafolder(BLENDER_USER_DATAFILES, + STUDIOLIGHT_MATCAP_FOLDER, + STUDIOLIGHT_TYPE_MATCAP | STUDIOLIGHT_USER_DEFINED); + } studiolight_add_files_from_datafolder(BLENDER_SYSTEM_DATAFILES, STUDIOLIGHT_LIGHTS_FOLDER, STUDIOLIGHT_TYPE_STUDIO); - studiolight_add_files_from_datafolder(BLENDER_USER_DATAFILES, STUDIOLIGHT_LIGHTS_FOLDER, STUDIOLIGHT_TYPE_STUDIO | STUDIOLIGHT_USER_DEFINED); studiolight_add_files_from_datafolder(BLENDER_SYSTEM_DATAFILES, STUDIOLIGHT_WORLD_FOLDER, STUDIOLIGHT_TYPE_WORLD); - studiolight_add_files_from_datafolder(BLENDER_USER_DATAFILES, STUDIOLIGHT_WORLD_FOLDER, STUDIOLIGHT_TYPE_WORLD | STUDIOLIGHT_USER_DEFINED); studiolight_add_files_from_datafolder(BLENDER_SYSTEM_DATAFILES, STUDIOLIGHT_MATCAP_FOLDER, STUDIOLIGHT_TYPE_MATCAP); - studiolight_add_files_from_datafolder(BLENDER_USER_DATAFILES, STUDIOLIGHT_MATCAP_FOLDER, STUDIOLIGHT_TYPE_MATCAP | STUDIOLIGHT_USER_DEFINED); /* sort studio lights on filename. */ BLI_listbase_sort(&studiolights, studiolight_cmp); |