Merge branch 'master' into refactor-mesh-position-genericrefactor-mesh-position-generic

1 files changed, 12 insertions, 5 deletions

diff --git a/source/blender/editors/include/ED_geometry.h b/source/blender/editors/include/ED_geometry.h
index 4620181894a..8436df73d10 100644
--- a/source/blender/editors/include/ED_geometry.h
+++ b/source/blender/editors/include/ED_geometry.h
@@ -15,14 +15,21 @@ extern "C" {
 #endif
 
 struct Mesh;
+struct ReportList;
 
 void ED_operatortypes_geometry(void);
+
+/**
+ * Convert an attribute with the given name to a new type and domain.
+ * The attribute must already exist.
+ *
+ * \note Does not support meshes in edit mode.
+ */
 bool ED_geometry_attribute_convert(struct Mesh *mesh,
-                                   const char *layer_name,
-                                   eCustomDataType old_type,
-                                   eAttrDomain old_domain,
-                                   eCustomDataType new_type,
-                                   eAttrDomain new_domain);
+                                   const char *name,
+                                   eCustomDataType dst_type,
+                                   eAttrDomain dst_domain,
+                                   ReportList *reports);
 #ifdef __cplusplus
 }
 #endif