[Bf-blender-cvs] [57b7eba4b68] sculpt-dev: Merge branch 'master' into sculpt-dev

[Pablo Dobarro]

Commit: 57b7eba4b68e2157b56a5492ef7c5a2003f70179
Author: Pablo Dobarro
Date:   Tue Mar 16 20:00:37 2021 +0100
Branches: sculpt-dev
https://developer.blender.org/rB57b7eba4b68e2157b56a5492ef7c5a2003f70179

Merge branch 'master' into sculpt-dev

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



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

diff --cc source/blender/editors/mesh/mesh_intern.h
index 397cffad9c5,763bdf04d83..b39ca2c0ad0
--- a/source/blender/editors/mesh/mesh_intern.h
+++ b/source/blender/editors/mesh/mesh_intern.h
@@@ -265,12 -265,9 +265,12 @@@ void MESH_OT_paint_mask_extract(struct 
  void MESH_OT_face_set_extract(struct wmOperatorType *ot);
  void MESH_OT_paint_mask_slice(struct wmOperatorType *ot);
  
 +/* *** editmesh_fair.c *** */
 +void MESH_OT_fair_vertices(struct wmOperatorType *ot);
 +
  struct wmKeyMap *point_normals_modal_keymap(wmKeyConfig *keyconf);
  
- #ifdef WITH_FREESTYLE
+ #if defined(WITH_FREESTYLE)
  void MESH_OT_mark_freestyle_edge(struct wmOperatorType *ot);
  void MESH_OT_mark_freestyle_face(struct wmOperatorType *ot);
  #endif