[Bf-blender-cvs] [6437be3a1b4] temp-sculpt-colors: Merge branch 'master' into temp-sculpt-colors

[Joseph Eagar]

Commit: 6437be3a1b4c813ba576d793f8e2f34cadc1ea7d
Author: Joseph Eagar
Date:   Fri Jan 7 07:57:34 2022 -0800
Branches: temp-sculpt-colors
https://developer.blender.org/rB6437be3a1b4c813ba576d793f8e2f34cadc1ea7d

Merge branch 'master' into temp-sculpt-colors

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



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

diff --cc release/scripts/addons
index c60fef38175,c08568cc376..6afec05c328
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit c60fef38175ad989ee0c45e924cb27e1417c8667
 -Subproject commit c08568cc376d2e4298710c4172fb0c74f0611de1
++Subproject commit 6afec05c3286cdea58ab269fb8dd1f5de011de4e
diff --cc source/blender/blenkernel/BKE_attribute.h
index 68d5c7948a3,db8f3759bf8..7b4ca0c0a55
--- a/source/blender/blenkernel/BKE_attribute.h
+++ b/source/blender/blenkernel/BKE_attribute.h
@@@ -63,14 -54,8 +63,10 @@@ typedef enum 
  
  bool BKE_id_attributes_supported(struct ID *id);
  
 +/* list_mask restricts unique name check to certain customdata types,
 +   if in doubt just pass CD_MASK_PROP_ALL */
- struct CustomDataLayer *BKE_id_attribute_new(struct ID *id,
-                                              const char *name,
-                                              const int type,
-                                              const AttributeDomain domain,
-                                              const CustomDataMask list_mask,
-                                              struct ReportList *reports);
+ struct CustomDataLayer *BKE_id_attribute_new(
+     struct ID *id, const char *name, int type, AttributeDomain domain, struct ReportList *reports);
  bool BKE_id_attribute_remove(struct ID *id,
                               struct CustomDataLayer *layer,
                               struct ReportList *reports);
diff --cc source/blender/blenkernel/BKE_data_transfer.h
index cfb567cc226,42cf2256e8c..9d06da94809
--- a/source/blender/blenkernel/BKE_data_transfer.h
+++ b/source/blender/blenkernel/BKE_data_transfer.h
@@@ -71,21 -69,16 +71,21 @@@ void BKE_object_data_transfer_dttypes_t
   * Check what can do each layer type
   * (if it is actually handled by transfer-data, if it supports advanced mixing.
   */
- bool BKE_object_data_transfer_get_dttypes_capacity(const int dtdata_types,
+ bool BKE_object_data_transfer_get_dttypes_capacity(int dtdata_types,
                                                     bool *r_advanced_mixing,
                                                     bool *r_threshold);
- int BKE_object_data_transfer_get_dttypes_item_types(const int dtdata_types);
+ int BKE_object_data_transfer_get_dttypes_item_types(int dtdata_types);
  
- int BKE_object_data_transfer_dttype_to_cdtype(const int dtdata_type);
- int BKE_object_data_transfer_dttype_to_srcdst_index(const int dtdata_type);
+ int BKE_object_data_transfer_dttype_to_cdtype(int dtdata_type);
+ int BKE_object_data_transfer_dttype_to_srcdst_index(int dtdata_type);
  
  #define DT_DATATYPE_IS_VERT(_dt) \
 -  ELEM(_dt, DT_TYPE_MDEFORMVERT, DT_TYPE_SHAPEKEY, DT_TYPE_SKIN, DT_TYPE_BWEIGHT_VERT)
 +  ELEM(_dt, \
 +       DT_TYPE_MDEFORMVERT, \
 +       DT_TYPE_SHAPEKEY, \
 +       DT_TYPE_SKIN, \
 +       DT_TYPE_BWEIGHT_VERT, \
 +       DT_TYPE_PROPCOL)
  #define DT_DATATYPE_IS_EDGE(_dt) \
    ELEM(_dt, \
         DT_TYPE_CREASE, \
diff --cc source/blender/blenloader/intern/versioning_300.c
index 4b00332ea82,152684db8f1..7bfc04d1696
--- a/source/blender/blenloader/intern/versioning_300.c
+++ b/source/blender/blenloader/intern/versioning_300.c
@@@ -44,8 -44,9 +44,10 @@@
  #include "DNA_lineart_types.h"
  #include "DNA_listBase.h"
  #include "DNA_material_types.h"
 +#include "DNA_mesh_types.h"
  #include "DNA_modifier_types.h"
+ #include "DNA_screen_types.h"
+ #include "DNA_space_types.h"
  #include "DNA_text_types.h"
  #include "DNA_workspace_types.h"