aryeramaty/blender
0
0
Fork 1
forked from blender/blender
Code Pull Requests Activity

realize-depth #5

Merged
Arye Ramaty merged 43 commits from David-Haver/blender:realize-depth into WIP-realize-depth 2024-03-31 17:22:49 +02:00
Conversation 0 Commits 43 Files Changed 70 +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
Showing only changes of commit 23fab6b6a6 - Show all commits

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]; char filepath[FILE_MAX];
Main *bmain = CTX_data_main(C); Main *bmain = CTX_data_main(C);
STRNCPY(filepath, BKE_main_blendfile_path(bmain)); /* Default to the same directory as the blend file. */
BLI_path_extension_replace(filepath, sizeof(filepath), ".abc"); BLI_path_split_dir_part(BKE_main_blendfile_path(bmain), filepath, sizeof(filepath));
RNA_string_set(op->ptr, "filepath", filepath); RNA_string_set(op->ptr, "filepath", filepath);
} }
@ -119,7 +119,7 @@ void CACHEFILE_OT_open(wmOperatorType *ot)
ot->cancel = open_cancel; ot->cancel = open_cancel;
WM_operator_properties_filesel(ot, WM_operator_properties_filesel(ot,
FILE_TYPE_ALEMBIC | FILE_TYPE_FOLDER, FILE_TYPE_ALEMBIC | FILE_TYPE_USD | FILE_TYPE_FOLDER,
FILE_BLENDER, FILE_BLENDER,
FILE_OPENFILE, FILE_OPENFILE,
WM_FILESEL_FILEPATH | WM_FILESEL_RELPATH, 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]; char filepath[FILE_MAX];
Main *bmain = CTX_data_main(C); Main *bmain = CTX_data_main(C);
STRNCPY(filepath, BKE_main_blendfile_path(bmain)); /* Default to the same directory as the blend file. */
BLI_path_extension_replace(filepath, sizeof(filepath), ".abc"); BLI_path_split_dir_part(BKE_main_blendfile_path(bmain), filepath, sizeof(filepath));
RNA_string_set(op->ptr, "filepath", 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; ot->exec = cachefile_layer_add_exec;
WM_operator_properties_filesel(ot, WM_operator_properties_filesel(ot,
FILE_TYPE_ALEMBIC | FILE_TYPE_FOLDER, FILE_TYPE_ALEMBIC | FILE_TYPE_USD | FILE_TYPE_FOLDER,
FILE_BLENDER, FILE_BLENDER,
FILE_OPENFILE, FILE_OPENFILE,
WM_FILESEL_FILEPATH | WM_FILESEL_RELPATH, WM_FILESEL_FILEPATH | WM_FILESEL_RELPATH,