Fix filebrowser not getting back to valid dir in Release builds.
authorBastien Montagne <montagne29@wanadoo.fr>
Thu, 15 Sep 2016 10:12:19 +0000 (12:12 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Thu, 15 Sep 2016 10:12:19 +0000 (12:12 +0200)
Stupid mistake wrapping path validation code inside a BLI_assert, which means it was
only called in Debug builds...

Found by Sergey, thanks.

Should be backported to 2.78.

source/blender/editors/space_file/filelist.c

index 81164b800b36e7dd24480547abbbefa0fc664432..6af36ea677831492b5174532132c2363fbb984b8 100644 (file)
@@ -1405,7 +1405,9 @@ void filelist_setdir(struct FileList *filelist, char *r_dir)
        BLI_assert(strlen(r_dir) < FILE_MAX_LIBEXTRA);
 
        BLI_cleanup_dir(G.main->name, r_dir);
-       BLI_assert(filelist->checkdirf(filelist, r_dir, true));
+       const bool is_valid_path = filelist->checkdirf(filelist, r_dir, true);
+       BLI_assert(is_valid_path);
+       UNUSED_VARS_NDEBUG(is_valid_path);
 
        if (!STREQ(filelist->filelist.root, r_dir)) {
                BLI_strncpy(filelist->filelist.root, r_dir, sizeof(filelist->filelist.root));