blender
/
blender
137
411
Fork 593
Code Issues 6.3k Pull Requests 768 Projects 19 Wiki Activity

Fix #99114: USD: Cache file operators now recognize USD as well as Alembic #118685

Merged
Brecht Van Lommel merged 2 commits from CharlesWardlaw/blender:bugfix/usd_cachefile_open into main 2024-03-25 14:51:11 +01:00
Conversation 2 Commits 2 Files Changed 1 +6 -6
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/editors/io/io_cache.cc
View File

@ -53,8 +53,8 @@ static int cachefile_open_invoke(bContext *C, wmOperator *op, const wmEvent * /*
char filepath[FILE_MAX];
Main *bmain = CTX_data_main(C);
STRNCPY(filepath, BKE_main_blendfile_path(bmain));
BLI_path_extension_replace(filepath, sizeof(filepath), ".abc");
deadpin marked this conversation as resolved Outdated
Jesse Yurkovich commented 2024-03-18 23:47:51 +01:00
Outdated
Review
Copy Link

With this change it's now possible to end up selecting the .blend file as a cache file because BKE_main_blendfile_path will return a path ending in .blend.

I think the intent of Bastien's comment was to just use the same directory so the following would be ok:

-    STRNCPY(filepath, BKE_main_blendfile_path(bmain));
-    BLI_path_extension_replace(filepath, sizeof(filepath), ".abc");
+    /* Default to the same directory as the blend file. */
+    BLI_path_split_dir_part(BKE_main_blendfile_path(bmain), filepath, sizeof(filepath));
With this change it's now possible to end up selecting the .blend file as a cache file because `BKE_main_blendfile_path` will return a path ending in .blend. I think the intent of Bastien's comment was to just use the same directory so the following would be ok: ```diff - STRNCPY(filepath, BKE_main_blendfile_path(bmain)); - BLI_path_extension_replace(filepath, sizeof(filepath), ".abc"); + /* Default to the same directory as the blend file. */ + BLI_path_split_dir_part(BKE_main_blendfile_path(bmain), filepath, sizeof(filepath)); ```
/* Default to the same directory as the blend file. */
BLI_path_split_dir_part(BKE_main_blendfile_path(bmain), filepath, sizeof(filepath));
RNA_string_set(op->ptr, "filepath", filepath);
}
@ -119,7 +119,7 @@ void CACHEFILE_OT_open(wmOperatorType *ot)
ot->cancel = open_cancel;
WM_operator_properties_filesel(ot,
FILE_TYPE_ALEMBIC | FILE_TYPE_FOLDER,
FILE_TYPE_ALEMBIC | FILE_TYPE_USD | FILE_TYPE_FOLDER,
FILE_BLENDER,
FILE_OPENFILE,
WM_FILESEL_FILEPATH | WM_FILESEL_RELPATH,
@ -163,8 +163,8 @@ static int cachefile_layer_open_invoke(bContext *C, wmOperator *op, const wmEven
char filepath[FILE_MAX];
Main *bmain = CTX_data_main(C);
STRNCPY(filepath, BKE_main_blendfile_path(bmain));
BLI_path_extension_replace(filepath, sizeof(filepath), ".abc");
/* Default to the same directory as the blend file. */
BLI_path_split_dir_part(BKE_main_blendfile_path(bmain), filepath, sizeof(filepath));
RNA_string_set(op->ptr, "filepath", filepath);
}
@ -215,7 +215,7 @@ void CACHEFILE_OT_layer_add(wmOperatorType *ot)
ot->exec = cachefile_layer_add_exec;
WM_operator_properties_filesel(ot,
FILE_TYPE_ALEMBIC | FILE_TYPE_FOLDER,
FILE_TYPE_ALEMBIC | FILE_TYPE_USD | FILE_TYPE_FOLDER,
FILE_BLENDER,
FILE_OPENFILE,
WM_FILESEL_FILEPATH | WM_FILESEL_RELPATH,