[Bf-blender-cvs] [436f1b4dbe3] master: Correct error building on WIN32

Campbell Barton noreply at git.blender.org
Fri Sep 9 15:21:45 CEST 2022


Commit: 436f1b4dbe3c111be12289cea4fa58b6aa148fc2
Author: Campbell Barton
Date:   Fri Sep 9 23:18:24 2022 +1000
Branches: master
https://developer.blender.org/rB436f1b4dbe3c111be12289cea4fa58b6aa148fc2

Correct error building on WIN32

Mistake in f7a4ede79f9512f39db8632ff112e08a93f3a9d4.

===================================================================

M	source/blender/blenkernel/intern/appdir.c

===================================================================

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 {



More information about the Bf-blender-cvs mailing list