[Bf-blender-cvs] [6264a6327f7] sculpt-dev: remove ATTR_NO_OPTs

[Joseph Eagar]

Commit: 6264a6327f742eb4ac9304f6e85154596e144207
Author: Joseph Eagar
Date:   Tue Oct 5 20:09:45 2021 -0700
Branches: sculpt-dev
https://developer.blender.org/rB6264a6327f742eb4ac9304f6e85154596e144207

remove ATTR_NO_OPTs

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

M	source/blender/blenkernel/intern/customdata.c
M	source/blender/blenkernel/intern/dyntopo.c
M	source/blender/editors/mesh/mesh_data.c
M	source/blender/editors/sculpt_paint/sculpt_dyntopo.c

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

diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c
index b2d1b0c544f..65462e6a8c1 100644
--- a/source/blender/blenkernel/intern/customdata.c
+++ b/source/blender/blenkernel/intern/customdata.c
@@ -74,7 +74,7 @@ BLI_STATIC_ASSERT(ARRAY_SIZE(((CustomData *)NULL)->typemap) == CD_NUMTYPES, "siz
 
 static CLG_LogRef LOG = {"bke.customdata"};
 
-ATTR_NO_OPT bool CustomData_layout_is_same(const CustomData *_a, const CustomData *_b)
+bool CustomData_layout_is_same(const CustomData *_a, const CustomData *_b)
 {
   CustomData a = *_a;
   CustomData b = *_b;
@@ -2240,7 +2240,7 @@ void CustomData_update_typemap(CustomData *data)
   }
 }
 
-ATTR_NO_OPT void CustomData_regen_active_refs(CustomData *data)
+void CustomData_regen_active_refs(CustomData *data)
 {
   int i, j;
 
diff --git a/source/blender/blenkernel/intern/dyntopo.c b/source/blender/blenkernel/intern/dyntopo.c
index bf37ecb12ec..6de21ce0f80 100644
--- a/source/blender/blenkernel/intern/dyntopo.c
+++ b/source/blender/blenkernel/intern/dyntopo.c
@@ -2597,14 +2597,14 @@ static void edge_queue_init(EdgeQueueContext *eq_ctx,
  *
  * The highest priority (lowest number) is given to the longest edge.
  */
-ATTR_NO_OPT static void long_edge_queue_create(EdgeQueueContext *eq_ctx,
-                                               PBVH *pbvh,
-                                               const float center[3],
-                                               const float view_normal[3],
-                                               float radius,
-                                               const bool use_frontface,
-                                               const bool use_projected,
-                                               const bool local_mode)
+static void long_edge_queue_create(EdgeQueueContext *eq_ctx,
+                                   PBVH *pbvh,
+                                   const float center[3],
+                                   const float view_normal[3],
+                                   float radius,
+                                   const bool use_frontface,
+                                   const bool use_projected,
+                                   const bool local_mode)
 {
   if (local_mode) {
     edge_queue_create_local(
diff --git a/source/blender/editors/mesh/mesh_data.c b/source/blender/editors/mesh/mesh_data.c
index b26a5b07201..baaee2d6346 100644
--- a/source/blender/editors/mesh/mesh_data.c
+++ b/source/blender/editors/mesh/mesh_data.c
@@ -512,10 +512,7 @@ static bool sculpt_vertex_color_remove_poll(bContext *C)
 }
 
 /* NOTE: keep in sync with #ED_mesh_uv_texture_add. */
-ATTR_NO_OPT int ED_mesh_sculpt_color_add(Mesh *me,
-                                         const char *name,
-                                         const bool active_set,
-                                         const bool do_init)
+int ED_mesh_sculpt_color_add(Mesh *me, const char *name, const bool active_set, const bool do_init)
 {
   BMEditMesh *em;
   int layernum;
diff --git a/source/blender/editors/sculpt_paint/sculpt_dyntopo.c b/source/blender/editors/sculpt_paint/sculpt_dyntopo.c
index 9d44e4ec472..a2b684c99cf 100644
--- a/source/blender/editors/sculpt_paint/sculpt_dyntopo.c
+++ b/source/blender/editors/sculpt_paint/sculpt_dyntopo.c
@@ -641,7 +641,7 @@ void SCULPT_dyntopo_node_layers_add(SculptSession *ss)
 /**
   Syncs customdata layers with internal bmesh, but ignores deleted layers.
 */
-ATTR_NO_OPT void SCULPT_dynamic_topology_sync_layers(Object *ob, Mesh *me)
+void SCULPT_dynamic_topology_sync_layers(Object *ob, Mesh *me)
 {
   SculptSession *ss = ob->sculpt;