Commit: def061207eaf96a0bf0bd45a7854ea4269580e6f
Author: Joseph Eagar
Date: Fri Jan 7 10:12:12 2022 -0800
Branches: temp-sculpt-colors
https://developer.blender.org/rBdef061207eaf96a0bf0bd45a7854ea4269580e6f
Fix merge error
===================================================================
M source/blender/blenkernel/BKE_attribute.h
===================================================================
diff --git a/source/blender/blenkernel/BKE_attribute.h
b/source/blender/blenkernel/BKE_attribute.h
index 7b4ca0c0a55..80d14fc31cd 100644
--- a/source/blender/blenkernel/BKE_attribute.h
+++ b/source/blender/blenkernel/BKE_attribute.h
@@ -65,8 +65,12 @@ 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, int type, AttributeDomain domain, struct
ReportList *reports);
+struct CustomDataLayer *BKE_id_attribute_new(struct ID *id,
+ const char *name,
+ int type,
+ AttributeDomain domain,
+ const CustomDataMask list_mask,
+ struct ReportList *reports);
bool BKE_id_attribute_remove(struct ID *id,
struct CustomDataLayer *layer,
struct ReportList *reports);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
