Commit: 533009b09579d256047cf3369f7d2ab54e46ed58
Author: Joseph Eagar
Date: Sun Jan 16 21:36:29 2022 -0800
Branches: sculpt-dev
https://developer.blender.org/rB533009b09579d256047cf3369f7d2ab54e46ed58
Merge branch 'master' into sculpt-dev
===================================================================
===================================================================
diff --cc source/blender/editors/geometry/geometry_attributes.cc
index 2ab20a04d46,9c0f6728701..30cec248a4f
--- a/source/blender/editors/geometry/geometry_attributes.cc
+++ b/source/blender/editors/geometry/geometry_attributes.cc
@@@ -35,11 -33,9 +35,11 @@@
#include "WM_api.h"
#include "WM_types.h"
+#include "DNA_mesh_types.h"
+
#include "ED_object.h"
- #include "geometry_intern.h"
+ #include "geometry_intern.hh"
/*********************** Attribute Operators ************************/
@@@ -90,13 -86,11 +90,13 @@@ static int geometry_attribute_add_exec(
char name[MAX_NAME];
RNA_string_get(op->ptr, "name", name);
+
CustomDataType type = (CustomDataType)RNA_enum_get(op->ptr, "data_type");
AttributeDomain domain = (AttributeDomain)RNA_enum_get(op->ptr, "domain");
- CustomDataLayer *layer = BKE_id_attribute_new(id, name, type, domain,
op->reports);
+ CustomDataLayer *layer = BKE_id_attribute_new(
+ id, name, type, CD_MASK_PROP_ALL, domain, op->reports);
- if (layer == NULL) {
+ if (layer == nullptr) {
return OPERATOR_CANCELLED;
}
diff --cc source/blender/editors/geometry/geometry_intern.hh
index a0cf7d3e801,14992476edd..b10aebcec02
--- a/source/blender/editors/geometry/geometry_intern.hh
+++ b/source/blender/editors/geometry/geometry_intern.hh
@@@ -25,9 -25,6 +25,9 @@@
struct wmOperatorType;
- /* *** geometry_attributes.c *** */
+ /* *** geometry_attributes.cc *** */
void GEOMETRY_OT_attribute_add(struct wmOperatorType *ot);
+void GEOMETRY_OT_color_attribute_add(struct wmOperatorType *ot);
void GEOMETRY_OT_attribute_remove(struct wmOperatorType *ot);
+void GEOMETRY_OT_color_attribute_remove(struct wmOperatorType *ot);
+
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
