diff options
| author | Campbell Barton <campbell@blender.org> | 2022-09-09 16:18:24 +0300 |
|---|---|---|
| committer | Campbell Barton <campbell@blender.org> | 2022-09-09 16:21:00 +0300 |
| commit | 436f1b4dbe3c111be12289cea4fa58b6aa148fc2 (patch) | |
| tree | a76139a93fa53b7b33e9a46785095613f20fc1e4 /source | |
| parent | 6039d1573242fa5444c013351c000c6994ef8caf (diff) | |
Correct error building on WIN32
Mistake in f7a4ede79f9512f39db8632ff112e08a93f3a9d4.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenkernel/intern/appdir.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/source/blender/blenkernel/intern/appdir.c b/source/blender/blenkernel/intern/appdir.c index 295e85a5fc4..f4dec0aecd7 100644 --- a/source/blender/blenkernel/intern/appdir.c +++ b/source/blender/blenkernel/intern/appdir.c @@ -811,7 +811,7 @@ static void where_am_i(char *fullname, const size_t maxlen, const char *name) # endif # ifdef _WIN32 - if (!strict) { + { wchar_t *fullname_16 = MEM_mallocN(maxlen * sizeof(wchar_t), "ProgramPath"); if (GetModuleFileNameW(0, fullname_16, maxlen)) { conv_utf_16_to_8(fullname_16, fullname, maxlen); @@ -835,18 +835,14 @@ static void where_am_i(char *fullname, const size_t maxlen, const char *name) if (name[0] == '.') { BLI_path_abs_from_cwd(fullname, maxlen); # ifdef _WIN32 - if (!strict) { - BLI_path_program_extensions_add_win32(fullname, maxlen); - } + BLI_path_program_extensions_add_win32(fullname, maxlen); # endif } else if (BLI_path_slash_rfind(name)) { /* Full path. */ BLI_strncpy(fullname, name, maxlen); # ifdef _WIN32 - if (!strict) { - BLI_path_program_extensions_add_win32(fullname, maxlen); - } + BLI_path_program_extensions_add_win32(fullname, maxlen); # endif } else { |