[Bf-blender-cvs] [a00507c482e] master: Templates: remove masking layers from the default startup file

[Campbell Barton]

Commit: a00507c482e28ad20813f082057d4a09061c03cc
Author: Campbell Barton
Date:   Fri Sep 10 19:18:13 2021 +1000
Branches: master
https://developer.blender.org/rBa00507c482e28ad20813f082057d4a09061c03cc

Templates: remove masking layers from the default startup file

Remove sculpt mask layer from the default cube, added in
444934632a8d8e239bc0c6d79a638ec0943152a6.

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

M	release/datafiles/startup.blend
M	source/blender/blenloader/intern/versioning_defaults.c

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

diff --git a/release/datafiles/startup.blend b/release/datafiles/startup.blend
index 20ebf5d9986..8caec075138 100644
Binary files a/release/datafiles/startup.blend and b/release/datafiles/startup.blend differ
diff --git a/source/blender/blenloader/intern/versioning_defaults.c b/source/blender/blenloader/intern/versioning_defaults.c
index 82c577d11a0..ae0dbb7f808 100644
--- a/source/blender/blenloader/intern/versioning_defaults.c
+++ b/source/blender/blenloader/intern/versioning_defaults.c
@@ -52,6 +52,7 @@
 #include "BKE_brush.h"
 #include "BKE_colortools.h"
 #include "BKE_curveprofile.h"
+#include "BKE_customdata.h"
 #include "BKE_gpencil.h"
 #include "BKE_layer.h"
 #include "BKE_lib_id.h"
@@ -552,6 +553,11 @@ void BLO_update_defaults_startup_blend(Main *bmain, const char *app_template)
       mesh->flag |= ME_REMESH_FIX_POLES | ME_REMESH_REPROJECT_VOLUME;
       BKE_mesh_smooth_flag_set(mesh, false);
     }
+    else {
+      /* Remove sculpt-mask data in default mesh objects for all non-sculpt templates. */
+      CustomData_free_layers(&mesh->vdata, CD_PAINT_MASK, mesh->totvert);
+      CustomData_free_layers(&mesh->ldata, CD_GRID_PAINT_MASK, mesh->totloop);
+    }
   }
 
   for (Camera *camera = bmain->cameras.first; camera; camera = camera->id.next) {