[Bf-blender-cvs] [f2c9706781f] temp_bmesh_multires: Get rid of various ATTR_NO_OPT debug attributes left from two commits ago.

[Joseph Eagar]

Commit: f2c9706781fb50fdcb2fd11416074c4ae3aa5345
Author: Joseph Eagar
Date:   Tue May 11 21:46:44 2021 -0700
Branches: temp_bmesh_multires
https://developer.blender.org/rBf2c9706781fb50fdcb2fd11416074c4ae3aa5345

Get rid of various ATTR_NO_OPT debug attributes left from two
commits ago.

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

M	source/blender/bmesh/intern/bmesh_log.c
M	source/blender/editors/sculpt_paint/sculpt.c
M	source/blender/editors/sculpt_paint/sculpt_dyntopo.c
M	source/blender/editors/sculpt_paint/sculpt_face_set.c
M	source/blender/editors/sculpt_paint/sculpt_undo.c

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

diff --git a/source/blender/bmesh/intern/bmesh_log.c b/source/blender/bmesh/intern/bmesh_log.c
index 8a37212f9d6..f793561119a 100644
--- a/source/blender/bmesh/intern/bmesh_log.c
+++ b/source/blender/bmesh/intern/bmesh_log.c
@@ -871,7 +871,7 @@ BMLog *BM_log_from_existing_entries_create(BMesh *bm, BMLogEntry *entry)
   return log;
 }
 
-ATTR_NO_OPT BMLog *BM_log_unfreeze(BMesh *bm, BMLogEntry *entry)
+BMLog *BM_log_unfreeze(BMesh *bm, BMLogEntry *entry)
 {
   if (!entry || !entry->log) {
     return NULL;
diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index d0abd706bc2..84f655be0c6 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -9192,7 +9192,7 @@ static void sculpt_init_session(Main *bmain, Depsgraph *depsgraph, Scene *scene,
   }
 }
 
-ATTR_NO_OPT void ED_object_sculptmode_enter_ex(Main *bmain,
+void ED_object_sculptmode_enter_ex(Main *bmain,
                                    Depsgraph *depsgraph,
                                    Scene *scene,
                                    Object *ob,
diff --git a/source/blender/editors/sculpt_paint/sculpt_dyntopo.c b/source/blender/editors/sculpt_paint/sculpt_dyntopo.c
index b8e8728b843..ee084cfc920 100644
--- a/source/blender/editors/sculpt_paint/sculpt_dyntopo.c
+++ b/source/blender/editors/sculpt_paint/sculpt_dyntopo.c
@@ -82,7 +82,7 @@
 #include <math.h>
 #include <stdlib.h>
 
-ATTR_NO_OPT void SCULPT_dynamic_topology_triangulate(BMesh *bm)
+void SCULPT_dynamic_topology_triangulate(BMesh *bm)
 {
   if (bm->totloop == bm->totface * 3) {
     return;
diff --git a/source/blender/editors/sculpt_paint/sculpt_face_set.c b/source/blender/editors/sculpt_paint/sculpt_face_set.c
index fcabf4d9fcc..6551f64350d 100644
--- a/source/blender/editors/sculpt_paint/sculpt_face_set.c
+++ b/source/blender/editors/sculpt_paint/sculpt_face_set.c
@@ -438,7 +438,7 @@ static EnumPropertyItem prop_sculpt_face_set_create_types[] = {
     {0, NULL, 0, NULL, NULL},
 };
 
-ATTR_NO_OPT static int sculpt_face_set_create_exec(bContext *C, wmOperator *op)
+static int sculpt_face_set_create_exec(bContext *C, wmOperator *op)
 {
   Object *ob = CTX_data_active_object(C);
   SculptSession *ss = ob->sculpt;
diff --git a/source/blender/editors/sculpt_paint/sculpt_undo.c b/source/blender/editors/sculpt_paint/sculpt_undo.c
index 21c0fc97b14..3a2f4be4d47 100644
--- a/source/blender/editors/sculpt_paint/sculpt_undo.c
+++ b/source/blender/editors/sculpt_paint/sculpt_undo.c
@@ -651,7 +651,7 @@ static void sculpt_undo_refine_subdiv(Depsgraph *depsgraph,
   MEM_freeN(deformed_verts);
 }
 
-ATTR_NO_OPT static void sculpt_undo_restore_list(bContext *C, Depsgraph *depsgraph, ListBase *lb)
+static void sculpt_undo_restore_list(bContext *C, Depsgraph *depsgraph, ListBase *lb)
 {
   Scene *scene = CTX_data_scene(C);
   ViewLayer *view_layer = CTX_data_view_layer(C);