[Bf-blender-cvs] [02f1982e7d9] sculpt-dev: Remove ATTR_NO_OPTs

[Joseph Eagar]

Commit: 02f1982e7d98d71e6d9cd17683cb7c37b7261c8d
Author: Joseph Eagar
Date:   Thu Sep 30 11:03:19 2021 -0700
Branches: sculpt-dev
https://developer.blender.org/rB02f1982e7d98d71e6d9cd17683cb7c37b7261c8d

Remove ATTR_NO_OPTs

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

M	source/blender/blenkernel/intern/brush_engine.c
M	source/blender/blenkernel/intern/paint.c
M	source/blender/editors/sculpt_paint/sculpt.c
M	source/blender/editors/sculpt_paint/sculpt_intern.h

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

diff --git a/source/blender/blenkernel/intern/brush_engine.c b/source/blender/blenkernel/intern/brush_engine.c
index cf4271c24d6..2023e389885 100644
--- a/source/blender/blenkernel/intern/brush_engine.c
+++ b/source/blender/blenkernel/intern/brush_engine.c
@@ -885,10 +885,10 @@ static bool channel_has_mappings(BrushChannel *ch)
 }
 
 // idx is used by vector channels
-ATTR_NO_OPT double BKE_brush_channel_eval_mappings(BrushChannel *ch,
-                                                   BrushMappingData *mapdata,
-                                                   double f,
-                                                   int idx)
+double BKE_brush_channel_eval_mappings(BrushChannel *ch,
+                                       BrushMappingData *mapdata,
+                                       double f,
+                                       int idx)
 {
 
   if (idx == 3 && !(ch->flag & BRUSH_CHANNEL_APPLY_MAPPING_TO_ALPHA)) {
diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c
index e4d65963772..5014a6c5a1c 100644
--- a/source/blender/blenkernel/intern/paint.c
+++ b/source/blender/blenkernel/intern/paint.c
@@ -2201,9 +2201,7 @@ static PBVH *build_pbvh_for_dynamic_topology(Object *ob)
   return pbvh;
 }
 
-ATTR_NO_OPT static PBVH *build_pbvh_from_regular_mesh(Object *ob,
-                                                      Mesh *me_eval_deform,
-                                                      bool respect_hide)
+static PBVH *build_pbvh_from_regular_mesh(Object *ob, Mesh *me_eval_deform, bool respect_hide)
 {
   SculptSession *ss = ob->sculpt;
   Mesh *me = BKE_object_get_original_mesh(ob);
@@ -2286,7 +2284,7 @@ static PBVH *build_pbvh_from_ccg(Object *ob, SubdivCCG *subdiv_ccg, bool respect
   return pbvh;
 }
 
-ATTR_NO_OPT bool BKE_sculptsession_check_mdyntopo(SculptSession *ss, PBVH *pbvh, int totvert)
+bool BKE_sculptsession_check_mdyntopo(SculptSession *ss, PBVH *pbvh, int totvert)
 {
   if (!ss->bm && (!ss->mdyntopo_verts || totvert != ss->mdyntopo_verts_size)) {
     init_mdyntopo_layer(ss, pbvh, totvert);
@@ -2296,7 +2294,7 @@ ATTR_NO_OPT bool BKE_sculptsession_check_mdyntopo(SculptSession *ss, PBVH *pbvh,
   return false;
 }
 
-ATTR_NO_OPT static void init_mdyntopo_layer_faces(SculptSession *ss, PBVH *pbvh, int totvert)
+static void init_mdyntopo_layer_faces(SculptSession *ss, PBVH *pbvh, int totvert)
 {
   if (ss->mdyntopo_verts) {
     MEM_freeN(ss->mdyntopo_verts);
@@ -2326,7 +2324,7 @@ ATTR_NO_OPT static void init_mdyntopo_layer_faces(SculptSession *ss, PBVH *pbvh,
   }
 }
 
-ATTR_NO_OPT static void init_mdyntopo_layer_grids(SculptSession *ss, PBVH *pbvh, int totvert)
+static void init_mdyntopo_layer_grids(SculptSession *ss, PBVH *pbvh, int totvert)
 {
   if (ss->mdyntopo_verts) {
     MEM_freeN(ss->mdyntopo_verts);
@@ -2349,7 +2347,7 @@ ATTR_NO_OPT static void init_mdyntopo_layer_grids(SculptSession *ss, PBVH *pbvh,
   }
 }
 
-ATTR_NO_OPT static void init_mdyntopo_layer(SculptSession *ss, PBVH *pbvh, int totvert)
+static void init_mdyntopo_layer(SculptSession *ss, PBVH *pbvh, int totvert)
 {
   if (BKE_pbvh_type(pbvh) == PBVH_FACES) {
     init_mdyntopo_layer_faces(ss, pbvh, totvert);
diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index c4c39decf8d..53a6cd0a42c 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -732,7 +732,7 @@ static bool sculpt_temp_customlayer_get(SculptSession *ss,
   return true;
 }
 
-ATTR_NO_OPT void SCULPT_update_customdata_refs(SculptSession *ss)
+void SCULPT_update_customdata_refs(SculptSession *ss)
 {
   /* run twice, in case sculpt_temp_customlayer_get had to recreate a layer and
      messed up the ordering. */
@@ -4811,7 +4811,7 @@ static void do_fairing_brush_tag_store_task_cb_ex(void *__restrict userdata,
   BKE_pbvh_vertex_iter_end;
 }
 
-ATTR_NO_OPT static void do_fairing_brush(Sculpt *sd, Object *ob, PBVHNode **nodes, int totnode)
+static void do_fairing_brush(Sculpt *sd, Object *ob, PBVHNode **nodes, int totnode)
 {
   SculptSession *ss = ob->sculpt;
   Brush *brush = BKE_paint_brush(&sd->paint);
diff --git a/source/blender/editors/sculpt_paint/sculpt_intern.h b/source/blender/editors/sculpt_paint/sculpt_intern.h
index fd05a7b7f8b..1b790ab2b64 100644
--- a/source/blender/editors/sculpt_paint/sculpt_intern.h
+++ b/source/blender/editors/sculpt_paint/sculpt_intern.h
@@ -1804,7 +1804,7 @@ int SCULPT_get_symmetry_pass(const SculptSession *ss);
 void SCULPT_on_sculptsession_bmesh_free(SculptSession *ss);
 void SCULPT_reorder_bmesh(SculptSession *ss);
 
-ATTR_NO_OPT static inline void *SCULPT_temp_cdata_get(SculptVertRef vertex, SculptCustomLayer *scl)
+static inline void *SCULPT_temp_cdata_get(SculptVertRef vertex, SculptCustomLayer *scl)
 {
   if (scl->data) {
     char *p = (char *)scl->data;