[Bf-blender-cvs] [93a840360a0] master: Cleanup: quiet clang warnings
Jacques Lucke
noreply at git.blender.org
Mon Jan 23 00:55:22 CET 2023
Commit: 93a840360a025df7830f48e4d7c398c3e45ff41c
Author: Jacques Lucke
Date: Mon Jan 23 00:55:15 2023 +0100
Branches: master
https://developer.blender.org/rB93a840360a025df7830f48e4d7c398c3e45ff41c
Cleanup: quiet clang warnings
===================================================================
M source/blender/blenkernel/intern/blendfile.cc
M source/blender/makesdna/DNA_userdef_types.h
M source/blender/windowmanager/intern/wm_files.cc
===================================================================
diff --git a/source/blender/blenkernel/intern/blendfile.cc b/source/blender/blenkernel/intern/blendfile.cc
index 9ccd3e7541a..2ac2ae43684 100644
--- a/source/blender/blenkernel/intern/blendfile.cc
+++ b/source/blender/blenkernel/intern/blendfile.cc
@@ -641,7 +641,7 @@ UserDef *BKE_blendfile_userdef_read_from_memory(const void *filebuf,
UserDef *BKE_blendfile_userdef_from_defaults(void)
{
UserDef *userdef = MEM_cnew<UserDef>(__func__);
- memcpy(userdef, &U_default, sizeof(*userdef));
+ *userdef = blender::dna::shallow_copy(U_default);
/* Add-ons. */
{
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h
index 4c9568d9228..0e96e1db30c 100644
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@ -659,6 +659,8 @@ typedef struct UserDef_Experimental {
(((userdef)->flag & USER_DEVELOPER_UI) && ((userdef)->experimental).member)
typedef struct UserDef {
+ DNA_DEFINE_CXX_METHODS(UserDef)
+
/** UserDef has separate do-version handling, and can be read from other files. */
int versionfile, subversionfile;
diff --git a/source/blender/windowmanager/intern/wm_files.cc b/source/blender/windowmanager/intern/wm_files.cc
index 75c9ea42e3a..8a0e206b5e7 100644
--- a/source/blender/windowmanager/intern/wm_files.cc
+++ b/source/blender/windowmanager/intern/wm_files.cc
@@ -2304,7 +2304,7 @@ static int wm_userpref_read_exec(bContext *C, wmOperator *op)
const bool use_factory_settings_app_template_only =
(use_factory_settings && RNA_boolean_get(op->ptr, "use_factory_startup_app_template_only"));
- UserDef U_backup = U;
+ UserDef U_backup = blender::dna::shallow_copy(U);
wmHomeFileRead_Params read_homefile_params{};
read_homefile_params.use_data = use_data;
@@ -2407,7 +2407,7 @@ static int wm_homefile_read_exec(bContext *C, wmOperator *op)
bool use_userdef = false;
char filepath_buf[FILE_MAX];
const char *filepath = nullptr;
- UserDef U_backup = U;
+ UserDef U_backup = blender::dna::shallow_copy(U);
if (!use_factory_settings) {
PropertyRNA *prop = RNA_struct_find_property(op->ptr, "filepath");
More information about the Bf-blender-cvs
mailing list