Xylvier/blender
0
0
Fork 0
forked from blender/blender
Code Pull Requests Activity

main sync #3

Merged
Patrick Busch merged 318 commits from blender/blender:main into main 2023-03-17 15:52:21 +01:00
Conversation 0 Commits 318 Files Changed 1069 +5 -8
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 39ab104761 - Show all commits

2
source/blender/editors/io/io_collada.c
View File

@ -44,7 +44,6 @@ static int wm_collada_export_invoke(bContext *C, wmOperator *op, const wmEvent *
return OPERATOR_RUNNING_MODAL; return OPERATOR_RUNNING_MODAL;
} }
/* function used for WM_OT_save_mainfile too */
static int wm_collada_export_exec(bContext *C, wmOperator *op) static int wm_collada_export_exec(bContext *C, wmOperator *op)
{ {
char filepath[FILE_MAX]; char filepath[FILE_MAX];
@ -673,7 +672,6 @@ void WM_OT_collada_export(wmOperatorType *ot)
"Store Bindpose information in custom bone properties for later use during Collada export"); "Store Bindpose information in custom bone properties for later use during Collada export");
} }
/* function used for WM_OT_save_mainfile too */
static int wm_collada_import_exec(bContext *C, wmOperator *op) static int wm_collada_import_exec(bContext *C, wmOperator *op)
{ {
char filename[FILE_MAX]; char filename[FILE_MAX];

11
source/blender/windowmanager/intern/wm_files.cc
View File

@ -3184,7 +3184,7 @@ static int wm_save_as_mainfile_invoke(bContext *C, wmOperator *op, const wmEvent
return OPERATOR_RUNNING_MODAL; return OPERATOR_RUNNING_MODAL;
} }
/* function used for WM_OT_save_mainfile too */ /* Function used for #WM_OT_save_mainfile too. */
static int wm_save_as_mainfile_exec(bContext *C, wmOperator *op) static int wm_save_as_mainfile_exec(bContext *C, wmOperator *op)
{ {
Main *bmain = CTX_data_main(C); Main *bmain = CTX_data_main(C);
@ -3257,8 +3257,7 @@ static int wm_save_as_mainfile_exec(bContext *C, wmOperator *op)
return OPERATOR_FINISHED; return OPERATOR_FINISHED;
} }
/* function used for WM_OT_save_mainfile too */ static bool wm_save_mainfile_check(bContext * /*C*/, wmOperator *op)
static bool blend_save_check(bContext * /*C*/, wmOperator *op)
{ {
char filepath[FILE_MAX]; char filepath[FILE_MAX];
RNA_string_get(op->ptr, "filepath", filepath); RNA_string_get(op->ptr, "filepath", filepath);
@ -3303,7 +3302,7 @@ void WM_OT_save_as_mainfile(wmOperatorType *ot)
ot->exec = wm_save_as_mainfile_exec; ot->exec = wm_save_as_mainfile_exec;
ot->get_name = wm_save_as_mainfile_get_name; ot->get_name = wm_save_as_mainfile_get_name;
ot->get_description = wm_save_as_mainfile_get_description; ot->get_description = wm_save_as_mainfile_get_description;
ot->check = blend_save_check; ot->check = wm_save_mainfile_check;
/* omit window poll so this can work in background mode */ /* omit window poll so this can work in background mode */
WM_operator_properties_filesel(ot, WM_operator_properties_filesel(ot,
@ -3370,8 +3369,8 @@ void WM_OT_save_mainfile(wmOperatorType *ot)
ot->invoke = wm_save_mainfile_invoke; ot->invoke = wm_save_mainfile_invoke;
ot->exec = wm_save_as_mainfile_exec; ot->exec = wm_save_as_mainfile_exec;
ot->check = blend_save_check; ot->check = wm_save_mainfile_check;
/* omit window poll so this can work in background mode */ /* Omit window poll so this can work in background mode. */
PropertyRNA *prop; PropertyRNA *prop;
WM_operator_properties_filesel(ot, WM_operator_properties_filesel(ot,