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 +73 -68
3 changed files with 73 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c10377cf08 - Show all commits

8
source/blender/blenkernel/intern/blendfile.cc
View File

@ -506,7 +506,7 @@ struct BlendFileData *BKE_blendfile_read(const char *filepath,
{
/* Don't print startup file loading. */
if (params->is_startup == false) {
printf("Read blend: %s\n", filepath);
printf("Read blend: \"%s\"\n", filepath);
}
BlendFileData *bfd = BLO_read_from_file(filepath, eBLOReadSkip(params->skip_flags), reports);
@ -518,7 +518,7 @@ struct BlendFileData *BKE_blendfile_read(const char *filepath,
handle_subversion_warning(bfd->main, reports);
}
else {
BKE_reports_prependf(reports->reports, "Loading '%s' failed: ", filepath);
BKE_reports_prependf(reports->reports, "Loading \"%s\" failed: ", filepath);
}
return bfd;
}
@ -768,7 +768,7 @@ bool BKE_blendfile_userdef_write_all(ReportList *reports)
bool ok_write;
BLI_path_join(filepath, sizeof(filepath), cfgdir, BLENDER_USERPREF_FILE);
printf("Writing userprefs: '%s' ", filepath);
printf("Writing userprefs: \"%s\" ", filepath);
if (use_template_userpref) {
ok_write = BKE_blendfile_userdef_write_app_template(filepath, reports);
}
@ -795,7 +795,7 @@ bool BKE_blendfile_userdef_write_all(ReportList *reports)
/* Also save app-template prefs */
BLI_path_join(filepath, sizeof(filepath), cfgdir, BLENDER_USERPREF_FILE);
printf("Writing userprefs app-template: '%s' ", filepath);
printf("Writing userprefs app-template: \"%s\" ", filepath);
if (BKE_blendfile_userdef_write(filepath, reports) != 0) {
printf("ok\n");
}

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

@ -591,9 +591,9 @@ void WM_file_autoexec_init(const char *filepath)
}
if (G.f & G_FLAG_SCRIPT_AUTOEXEC) {
char path[FILE_MAX];
BLI_split_dir_part(filepath, path, sizeof(path));
if (BKE_autoexec_match(path)) {
char dirpath[FILE_MAX];
BLI_split_dir_part(filepath, dirpath, sizeof(dirpath));
if (BKE_autoexec_match(dirpath)) {
G.f &= ~G_FLAG_SCRIPT_AUTOEXEC;
}
}
@ -878,8 +878,10 @@ static void file_read_reports_finalize(BlendFileReadReport *bf_reports)
for (LinkNode *node_lib = bf_reports->resynced_lib_overrides_libraries; node_lib != nullptr;
node_lib = node_lib->next) {
Library *library = static_cast<Library *>(node_lib->link);
BKE_reportf(
bf_reports->reports, RPT_INFO, "Library %s needs overrides resync", library->filepath);
BKE_reportf(bf_reports->reports,
RPT_INFO,
"Library \"%s\" needs overrides resync",
library->filepath);
}
}
@ -1028,18 +1030,18 @@ bool WM_file_read(bContext *C, const char *filepath, ReportList *reports)
else if (retval == BKE_READ_EXOTIC_FAIL_OPEN) {
BKE_reportf(reports,
RPT_ERROR,
"Cannot read file '%s': %s",
"Cannot read file \"%s\": %s",
filepath,
errno ? strerror(errno) : TIP_("unable to open the file"));
}
else if (retval == BKE_READ_EXOTIC_FAIL_FORMAT) {
BKE_reportf(reports, RPT_ERROR, "File format is not supported in file '%s'", filepath);
BKE_reportf(reports, RPT_ERROR, "File format is not supported in file \"%s\"", filepath);
}
else if (retval == BKE_READ_EXOTIC_FAIL_PATH) {
BKE_reportf(reports, RPT_ERROR, "File path '%s' invalid", filepath);
BKE_reportf(reports, RPT_ERROR, "File path \"%s\" invalid", filepath);
}
else {
BKE_reportf(reports, RPT_ERROR, "Unknown error loading '%s'", filepath);
BKE_reportf(reports, RPT_ERROR, "Unknown error loading \"%s\"", filepath);
BLI_assert_msg(0, "invalid 'retval'");
}
@ -1243,7 +1245,7 @@ void wm_homefile_read_ex(bContext *C,
userdef = nullptr;
skip_flags |= BLO_READ_SKIP_USERDEF;
printf("Read prefs: %s\n", filepath_userdef);
printf("Read prefs: \"%s\"\n", filepath_userdef);
}
}
}
@ -1252,7 +1254,7 @@ void wm_homefile_read_ex(bContext *C,
if (!BKE_appdir_app_template_id_search(
app_template, app_template_system, sizeof(app_template_system))) {
/* Can safely continue with code below, just warn it's not found. */
BKE_reportf(reports, RPT_WARNING, "Application Template '%s' not found", app_template);
BKE_reportf(reports, RPT_WARNING, "Application Template \"%s\" not found", app_template);
}
/* Insert template name into startup file. */
@ -1312,7 +1314,7 @@ void wm_homefile_read_ex(bContext *C,
if (success == false && filepath_startup_override && reports) {
/* We can not return from here because wm is already reset */
BKE_reportf(reports, RPT_ERROR, "Could not read '%s'", filepath_startup_override);
BKE_reportf(reports, RPT_ERROR, "Could not read \"%s\"", filepath_startup_override);
}
if (success == false) {
@ -1779,17 +1781,14 @@ static ImBuf *blend_file_thumb_from_camera(const bContext *C,
bool write_crash_blend(void)
{
char path[FILE_MAX];
char filepath[FILE_MAX];
BLI_strncpy(path, BKE_main_blendfile_path_from_global(), sizeof(path));
BLI_path_extension_replace(path, sizeof(path), "_crash.blend");
BLI_strncpy(filepath, BKE_main_blendfile_path_from_global(), sizeof(filepath));
BLI_path_extension_replace(filepath, sizeof(filepath), "_crash.blend");
BlendFileWriteParams params{};
if (BLO_write_file(G_MAIN, path, G.fileflags, &params, nullptr)) {
printf("written: %s\n", path);
return 1;
}
printf("failed: %s\n", path);
return 0;
const bool success = BLO_write_file(G_MAIN, filepath, G.fileflags, &params, nullptr);
printf("%s: \"%s\"\n", success ? "written" : "failed", filepath);
return success;
}
/**
@ -1813,7 +1812,8 @@ static bool wm_file_write_check_with_report_on_failure(Main *bmain,
/* Check if file write permission is ok */
if (BLI_exists(filepath) && !BLI_file_is_writable(filepath)) {
BKE_reportf(reports, RPT_ERROR, "Cannot save blend file, path '%s' is not writable", filepath);
BKE_reportf(
reports, RPT_ERROR, "Cannot save blend file, path \"%s\" is not writable", filepath);
return false;
}
@ -1838,7 +1838,6 @@ static bool wm_file_write(bContext *C,
ReportList *reports)
{
Main *bmain = CTX_data_main(C);
int ok = false;
BlendThumbnail *thumb = nullptr, *main_thumb = nullptr;
ImBuf *ibuf_thumb = nullptr;
@ -1847,7 +1846,7 @@ static bool wm_file_write(bContext *C,
* its handy for scripts to save to a predefined name without blender editing it */
if (!wm_file_write_check_with_report_on_failure(bmain, filepath, reports)) {
return ok;
return false;
}
/* Call pre-save callbacks before writing preview,
@ -1926,7 +1925,10 @@ static bool wm_file_write(bContext *C,
blend_write_params.use_save_versions = true;
blend_write_params.use_save_as_copy = use_save_as_copy;
blend_write_params.thumb = thumb;
if (BLO_write_file(bmain, filepath, fileflags, &blend_write_params, reports)) {
const bool success = BLO_write_file(bmain, filepath, fileflags, &blend_write_params, reports);
if (success) {
const bool do_history_file_update = (G.background == false) &&
(CTX_wm_manager(C)->op_undo_depth == 0);
@ -1949,12 +1951,10 @@ static bool wm_file_write(bContext *C,
/* Without this there is no feedback the file was saved. */
BKE_reportf(reports, RPT_INFO, "Saved \"%s\"", BLI_path_basename(filepath));
/* Success. */
ok = true;
}
BKE_callback_exec_string(bmain, ok ? BKE_CB_EVT_SAVE_POST : BKE_CB_EVT_SAVE_POST_FAIL, filepath);
BKE_callback_exec_string(
bmain, success ? BKE_CB_EVT_SAVE_POST : BKE_CB_EVT_SAVE_POST_FAIL, filepath);
if (ibuf_thumb) {
IMB_freeImBuf(ibuf_thumb);
@ -1965,7 +1965,7 @@ static bool wm_file_write(bContext *C,
WM_cursor_wait(false);
return ok;
return success;
}
/** \} */
@ -1977,7 +1977,7 @@ static bool wm_file_write(bContext *C,
static void wm_autosave_location(char filepath[FILE_MAX])
{
const int pid = abs(getpid());
char path[1024];
char filename[1024];
/* Normally there is no need to check for this to be nullptr,
* however this runs on exit when it may be cleared. */
@ -1987,10 +1987,10 @@ static void wm_autosave_location(char filepath[FILE_MAX])
if (blendfile_path && (blendfile_path[0] != '\0')) {
const char *basename = BLI_path_basename(blendfile_path);
int len = strlen(basename) - 6;
BLI_snprintf(path, sizeof(path), "%.*s_%d_autosave.blend", len, basename, pid);
BLI_snprintf(filename, sizeof(filename), "%.*s_%d_autosave.blend", len, basename, pid);
}
else {
BLI_snprintf(path, sizeof(path), "%d_autosave.blend", pid);
BLI_snprintf(filename, sizeof(filename), "%d_autosave.blend", pid);
}
const char *tempdir_base = BKE_tempdir_base();
@ -2007,7 +2007,7 @@ static void wm_autosave_location(char filepath[FILE_MAX])
}
#endif
BLI_path_join(filepath, FILE_MAX, tempdir_base, path);
BLI_path_join(filepath, FILE_MAX, tempdir_base, filename);
}
static void wm_autosave_write(Main *bmain, wmWindowManager *wm)
@ -2204,7 +2204,7 @@ static int wm_homefile_write_exec(bContext *C, wmOperator *op)
BLI_path_join(filepath, sizeof(filepath), cfgdir, BLENDER_STARTUP_FILE);
printf("Writing homefile: '%s' ", filepath);
printf("Writing homefile: \"%s\" ", filepath);
ED_editors_flush_edits(bmain);
@ -2218,11 +2218,13 @@ static int wm_homefile_write_exec(bContext *C, wmOperator *op)
blend_write_params.remap_mode = BLO_WRITE_PATH_REMAP_ABSOLUTE;
/* Don't apply any path changes to the current blend file. */
blend_write_params.use_save_as_copy = true;
const bool ok = BLO_write_file(bmain, filepath, fileflags, &blend_write_params, op->reports);
BKE_callback_exec_string(bmain, ok ? BKE_CB_EVT_SAVE_POST : BKE_CB_EVT_SAVE_POST_FAIL, "");
const bool success = BLO_write_file(
bmain, filepath, fileflags, &blend_write_params, op->reports);
if (ok) {
BKE_callback_exec_string(bmain, success ? BKE_CB_EVT_SAVE_POST : BKE_CB_EVT_SAVE_POST_FAIL, "");
if (success) {
printf("ok\n");
BKE_report(op->reports, RPT_INFO, "Startup file saved");
return OPERATOR_FINISHED;
@ -2255,9 +2257,9 @@ static int wm_userpref_write_exec(bContext *C, wmOperator *op)
/* Update keymaps in user preferences. */
WM_keyconfig_update(wm);
const bool ok = BKE_blendfile_userdef_write_all(op->reports);
const bool success = BKE_blendfile_userdef_write_all(op->reports);
return ok ? OPERATOR_FINISHED : OPERATOR_CANCELLED;
return success ? OPERATOR_FINISHED : OPERATOR_CANCELLED;
}
void WM_OT_save_userpref(wmOperatorType *ot)
@ -2471,7 +2473,7 @@ static int wm_homefile_read_exec(bContext *C, wmOperator *op)
filepath = filepath_buf;
if (BLI_access(filepath, R_OK)) {
BKE_reportf(
op->reports, RPT_ERROR, "Can't read alternative start-up file: '%s'", filepath);
op->reports, RPT_ERROR, "Can't read alternative start-up file: \"%s\"", filepath);
return OPERATOR_CANCELLED;
}
}
@ -2632,8 +2634,6 @@ void WM_OT_read_factory_settings(wmOperatorType *ot)
*/
static bool wm_file_read_opwrap(bContext *C, const char *filepath, ReportList *reports)
{
bool success;
/* XXX wm in context is not set correctly after WM_file_read -> crash */
/* do it before for now, but is this correct with multiple windows? */
WM_event_add_notifier(C, NC_WINDOW, nullptr);
@ -2643,7 +2643,7 @@ static bool wm_file_read_opwrap(bContext *C, const char *filepath, ReportList *r
WM_file_autoexec_init(filepath);
}
success = WM_file_read(C, filepath, reports);
const bool success = WM_file_read(C, filepath, reports);
return success;
}
@ -2810,13 +2810,12 @@ static char *wm_open_mainfile_description(struct bContext * /*C*/,
return nullptr;
}
/* Filepath. */
char path[FILE_MAX];
RNA_string_get(params, "filepath", path);
char filepath[FILE_MAX];
RNA_string_get(params, "filepath", filepath);
BLI_stat_t stats;
if (BLI_stat(path, &stats) == -1) {
return BLI_sprintfN("%s\n\n%s", path, TIP_("File Not Found"));
if (BLI_stat(filepath, &stats) == -1) {
return BLI_sprintfN("%s\n\n%s", filepath, TIP_("File Not Found"));
}
/* Date. */
@ -2833,8 +2832,13 @@ static char *wm_open_mainfile_description(struct bContext * /*C*/,
char size_str[FILELIST_DIRENTRY_SIZE_LEN];
BLI_filelist_entry_size_to_string(nullptr, uint64_t(stats.st_size), false, size_str);
return BLI_sprintfN(
"%s\n\n%s: %s %s\n%s: %s", path, TIP_("Modified"), date_st, time_st, TIP_("Size"), size_str);
return BLI_sprintfN("%s\n\n%s: %s %s\n%s: %s",
filepath,
TIP_("Modified"),
date_st,
time_st,
TIP_("Size"),
size_str);
}
/* currently fits in a pointer */
@ -2849,19 +2853,19 @@ static bool wm_open_mainfile_check(bContext * /*C*/, wmOperator *op)
struct FileRuntime *file_info = (struct FileRuntime *)&op->customdata;
PropertyRNA *prop = RNA_struct_find_property(op->ptr, "use_scripts");
bool is_untrusted = false;
char path[FILE_MAX];
char filepath[FILE_MAX];
char *lslash;
RNA_string_get(op->ptr, "filepath", path);
RNA_string_get(op->ptr, "filepath", filepath);
/* get the dir */
lslash = (char *)BLI_path_slash_rfind(path);
lslash = (char *)BLI_path_slash_rfind(filepath);
if (lslash) {
*(lslash + 1) = '\0';
}
if ((U.flag & USER_SCRIPT_AUTOEXEC_DISABLE) == 0) {
if (BKE_autoexec_match(path) == true) {
if (BKE_autoexec_match(filepath) == true) {
RNA_property_boolean_set(op->ptr, prop, false);
is_untrusted = true;
}
@ -3184,7 +3188,7 @@ static int wm_save_as_mainfile_invoke(bContext *C, wmOperator *op, const wmEvent
static int wm_save_as_mainfile_exec(bContext *C, wmOperator *op)
{
Main *bmain = CTX_data_main(C);
char path[FILE_MAX];
char filepath[FILE_MAX];
const bool is_save_as = (op->type->invoke == wm_save_as_mainfile_invoke);
const bool use_save_as_copy = is_save_as && RNA_boolean_get(op->ptr, "copy");
@ -3198,13 +3202,13 @@ static int wm_save_as_mainfile_exec(bContext *C, wmOperator *op)
const bool is_filepath_set = RNA_struct_property_is_set(op->ptr, "filepath");
if (is_filepath_set) {
RNA_string_get(op->ptr, "filepath", path);
RNA_string_get(op->ptr, "filepath", filepath);
}
else {
STRNCPY(path, BKE_main_blendfile_path(bmain));
STRNCPY(filepath, BKE_main_blendfile_path(bmain));
}
if (path[0] == '\0') {
if (filepath[0] == '\0') {
BKE_report(op->reports,
RPT_ERROR,
"Unable to save an unsaved file with an empty or unset \"filepath\" property");
@ -3216,11 +3220,11 @@ static int wm_save_as_mainfile_exec(bContext *C, wmOperator *op)
* Even though this should never happen, there may be some corner case where a malformed
* path is stored in `G.main->filepath`: when the file path is initialized from recovering
* a blend file - for example, so in this case failing to save isn't ideal. */
if (is_filepath_set && !BLI_path_is_abs_from_cwd(path)) {
if (is_filepath_set && !BLI_path_is_abs_from_cwd(filepath)) {
BKE_reportf(op->reports,
RPT_ERROR,
"The \"filepath\" property was not an absolute path: \"%s\"",
path);
filepath);
return OPERATOR_CANCELLED;
}
@ -3230,7 +3234,8 @@ static int wm_save_as_mainfile_exec(bContext *C, wmOperator *op)
/* set compression flag */
SET_FLAG_FROM_TEST(fileflags, RNA_boolean_get(op->ptr, "compress"), G_FILE_COMPRESS);
const bool ok = wm_file_write(C, path, fileflags, remap_mode, use_save_as_copy, op->reports);
const bool success = wm_file_write(
C, filepath, fileflags, remap_mode, use_save_as_copy, op->reports);
if ((op->flag & OP_IS_INVOKE) == 0) {
/* OP_IS_INVOKE is set when the operator is called from the GUI.
@ -3239,7 +3244,7 @@ static int wm_save_as_mainfile_exec(bContext *C, wmOperator *op)
G.fileflags = fileflags_orig;
}
if (ok == false) {
if (success == false) {
return OPERATOR_CANCELLED;
}

2
source/blender/windowmanager/intern/wm_init_exit.cc
View File

@ -457,7 +457,7 @@ void WM_exit_ex(bContext *C, const bool do_python)
if ((has_edited &&
BLO_write_file(bmain, filepath, fileflags, &blend_file_write_params, nullptr)) ||
BLO_memfile_write_file(undo_memfile, filepath)) {
printf("Saved session recovery to '%s'\n", filepath);
printf("Saved session recovery to \"%s\"\n", filepath);
}
}
}