[Bf-blender-cvs] [e40b0d52cfc] master: Preferences: enable Duplicate Data for curves and point cloud objects

[Jacques Lucke]

Commit: e40b0d52cfcc44486fe3c2a96c5746dd1c8f4471
Author: Jacques Lucke
Date:   Tue Apr 5 15:19:38 2022 +0200
Branches: master
https://developer.blender.org/rBe40b0d52cfcc44486fe3c2a96c5746dd1c8f4471

Preferences: enable Duplicate Data for curves and point cloud objects

Those geometry types are expected to behave the same as e.g. mesh
with respect to data copying. The fact that this was not enabled
already was an oversight in the initial commit that added these types.

Differential Revision: https://developer.blender.org/D14554

===================================================================

M	release/datafiles/userdef/userdef_default.c
M	source/blender/blenkernel/BKE_blender_version.h
M	source/blender/blenloader/intern/versioning_userdef.c

===================================================================

diff --git a/release/datafiles/userdef/userdef_default.c b/release/datafiles/userdef/userdef_default.c
index 7cf8158c42d..fba3c7882c6 100644
--- a/release/datafiles/userdef/userdef_default.c
+++ b/release/datafiles/userdef/userdef_default.c
@@ -23,7 +23,8 @@ const UserDef U_default = {
              USER_SCRIPT_AUTOEXEC_DISABLE | USER_NONEGFRAMES),
     .dupflag = USER_DUP_MESH | USER_DUP_CURVE | USER_DUP_SURF | USER_DUP_LATTICE | USER_DUP_FONT |
                USER_DUP_MBALL | USER_DUP_LAMP | USER_DUP_ARM | USER_DUP_CAMERA | USER_DUP_SPEAKER |
-               USER_DUP_ACT | USER_DUP_LIGHTPROBE | USER_DUP_GPENCIL,
+               USER_DUP_ACT | USER_DUP_LIGHTPROBE | USER_DUP_GPENCIL | USER_DUP_CURVES |
+               USER_DUP_POINTCLOUD,
     .pref_flag = USER_PREF_FLAG_SAVE,
     .savetime = 2,
     .tempdir = "",
diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h
index 1651ea243f2..34f3b9afacd 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -25,7 +25,7 @@ extern "C" {
 
 /* Blender file format version. */
 #define BLENDER_FILE_VERSION BLENDER_VERSION
-#define BLENDER_FILE_SUBVERSION 10
+#define BLENDER_FILE_SUBVERSION 11
 
 /* Minimum Blender version that supports reading file written with the current
  * version. Older Blender versions will test this and show a warning if the file
diff --git a/source/blender/blenloader/intern/versioning_userdef.c b/source/blender/blenloader/intern/versioning_userdef.c
index ac5e3f97948..b3f3b9cbf7d 100644
--- a/source/blender/blenloader/intern/versioning_userdef.c
+++ b/source/blender/blenloader/intern/versioning_userdef.c
@@ -1011,6 +1011,10 @@ void blo_do_versions_userdef(UserDef *userdef)
                                     NULL);
   }
 
+  if (!USER_VERSION_ATLEAST(302, 11)) {
+    userdef->dupflag |= USER_DUP_CURVES | USER_DUP_POINTCLOUD;
+  }
+
   /**
    * Versioning code until next subversion bump goes here.
    *