archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Workbench: Support HDR files as HDRI studio lighting

Browse Source 
support Radiance HDR files for studio lighting.
Fix crash when studiolight folder does not exist.
This commit is contained in:
Jeroen Bakker
2018-05-14 09:55:23 +02:00
parent 379c3e46d5
commit 95869f5838
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
source/blender/blenkernel/intern/studiolight.c
View File

@@ -52,6 +52,7 @@
/* Statics */
static ListBase studiolights;
#define STUDIO_LIGHT_EXTENSIONS ".jpg", ".hdr"
static const char *STUDIO_LIGHT_FOLDER = "studiolights/";
/* FUNCTIONS */
@@ -178,23 +179,25 @@ void BKE_studiolight_init(void)
struct direntry *dir;
const char *folder = BKE_appdir_folder_id(BLENDER_DATAFILES, STUDIO_LIGHT_FOLDER);
unsigned int totfile = BLI_filelist_dir_contents(folder, &dir);
int i;
for (i = 0; i < totfile; i++) {
if ((dir[i].type & S_IFREG)) {
const char *filename = dir[i].relname;
const char *path = dir[i].path;
if (BLI_testextensie(filename, ".jpg")) {
sl = studiolight_create();
sl->flag = STUDIOLIGHT_EXTERNAL_FILE;
BLI_strncpy(sl->name, filename, FILE_MAXFILE);
BLI_strncpy(sl->path, path, FILE_MAXFILE);
BLI_addtail(&studiolights, sl);
if (folder) {
unsigned int totfile = BLI_filelist_dir_contents(folder, &dir);
int i;
for (i = 0; i < totfile; i++) {
if ((dir[i].type & S_IFREG)) {
const char *filename = dir[i].relname;
const char *path = dir[i].path;
if (BLI_testextensie_n(filename, STUDIO_LIGHT_EXTENSIONS, NULL)) {
sl = studiolight_create();
sl->flag = STUDIOLIGHT_EXTERNAL_FILE;
BLI_strncpy(sl->name, filename, FILE_MAXFILE);
BLI_strncpy(sl->path, path, FILE_MAXFILE);
BLI_addtail(&studiolights, sl);
}
}
}
BLI_filelist_free(dir, totfile);
dir = NULL;
}
BLI_filelist_free(dir, totfile);
dir = NULL;
}
void BKE_studiolight_free(void)