diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-06-17 17:18:15 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-17 17:18:15 +0300 |
commit | 56173e512cab020a5bc96e6d3069641a03d47fbe (patch) | |
tree | 112fcb93a1898fadb34c2b74ae32471a6364a969 /source/blender/blenkernel/intern/studiolight.c | |
parent | 6855d537e3112f7ba4d84524d06a524b0ea9f7b1 (diff) | |
parent | a0a1fc89387f0f1396b5e4320c2dd4a6fedd1c25 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/studiolight.c')
-rw-r--r-- | source/blender/blenkernel/intern/studiolight.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/studiolight.c b/source/blender/blenkernel/intern/studiolight.c index 297993ae3e4..b116e99e63b 100644 --- a/source/blender/blenkernel/intern/studiolight.c +++ b/source/blender/blenkernel/intern/studiolight.c @@ -549,7 +549,7 @@ static void studiolight_add_files_from_datafolder(const int folder_id, const cha if ((dir[i].type & S_IFREG)) { const char *filename = dir[i].relname; const char *path = dir[i].path; - if (BLI_testextensie_array(filename, imb_ext_image)) { + if (BLI_path_extension_check_array(filename, imb_ext_image)) { sl = studiolight_create(STUDIOLIGHT_EXTERNAL_FILE | flag); BLI_strncpy(sl->name, filename, FILE_MAXFILE); BLI_strncpy(sl->path, path, FILE_MAXFILE); |