[Bf-blender-cvs] [edce42e47a2] refactor-mesh-bevel-weight-generic: Merge branch 'master' into refactor-mesh-bevel-weight-generic

[Hans Goudey]

Commit: edce42e47a2685f69720b4606cd863d9838d7331
Author: Hans Goudey
Date:   Sun May 22 21:00:06 2022 +0200
Branches: refactor-mesh-bevel-weight-generic
https://developer.blender.org/rBedce42e47a2685f69720b4606cd863d9838d7331

Merge branch 'master' into refactor-mesh-bevel-weight-generic

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



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

diff --cc source/blender/editors/mesh/mesh_intern.h
index c183c088a8e,1ee4be50322..7e60e5c6504
--- a/source/blender/editors/mesh/mesh_intern.h
+++ b/source/blender/editors/mesh/mesh_intern.h
@@@ -314,7 -318,7 +318,11 @@@ void MESH_OT_customdata_skin_add(struc
  void MESH_OT_customdata_skin_clear(struct wmOperatorType *ot);
  void MESH_OT_customdata_custom_splitnormals_add(struct wmOperatorType *ot);
  void MESH_OT_customdata_custom_splitnormals_clear(struct wmOperatorType *ot);
 +void MESH_OT_customdata_bevel_weight_vertex_add(struct wmOperatorType *ot);
 +void MESH_OT_customdata_bevel_weight_vertex_clear(struct wmOperatorType *ot);
 +void MESH_OT_customdata_bevel_weight_edge_add(struct wmOperatorType *ot);
 +void MESH_OT_customdata_bevel_weight_edge_clear(struct wmOperatorType *ot);
+ 
+ #ifdef __cplusplus
+ }
+ #endif