[Bf-blender-cvs] [4e2a5c5562f] sculpt-dev: Remove debugging ATTR_NO_OPTS
Joseph Eagar
noreply at git.blender.org
Mon Oct 4 09:10:43 CEST 2021
Commit: 4e2a5c5562f3bbe79eacea201e27d30b37a5e580
Author: Joseph Eagar
Date: Mon Oct 4 00:10:18 2021 -0700
Branches: sculpt-dev
https://developer.blender.org/rB4e2a5c5562f3bbe79eacea201e27d30b37a5e580
Remove debugging ATTR_NO_OPTS
===================================================================
M source/blender/blenkernel/intern/customdata.c
M source/blender/blenkernel/intern/dyntopo.c
M source/blender/bmesh/intern/bmesh_construct.c
M source/blender/bmesh/intern/bmesh_core.c
M source/blender/bmesh/intern/bmesh_log.c
M source/blender/bmesh/intern/bmesh_mesh.c
M source/blender/bmesh/intern/bmesh_mods.c
M source/blender/bmesh/intern/bmesh_operator_api.h
M source/blender/bmesh/intern/bmesh_operators.c
M source/blender/editors/sculpt_paint/sculpt.c
M source/blender/editors/sculpt_paint/sculpt_face_set.c
===================================================================
diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c
index 47735542f5f..38090abf9fc 100644
--- a/source/blender/blenkernel/intern/customdata.c
+++ b/source/blender/blenkernel/intern/customdata.c
@@ -3932,7 +3932,7 @@ void CustomData_bmesh_free_block_data(CustomData *data, void *block)
}
}
-ATTR_NO_OPT static void CustomData_bmesh_alloc_block(CustomData *data, void **block)
+static void CustomData_bmesh_alloc_block(CustomData *data, void **block)
{
if (*block) {
CustomData_bmesh_free_block(data, block);
@@ -4000,7 +4000,7 @@ static void CustomData_bmesh_set_default_n(CustomData *data, void **block, int n
}
}
-ATTR_NO_OPT void CustomData_bmesh_set_default(CustomData *data, void **block)
+void CustomData_bmesh_set_default(CustomData *data, void **block)
{
if (!*block) {
CustomData_bmesh_alloc_block(data, block);
diff --git a/source/blender/blenkernel/intern/dyntopo.c b/source/blender/blenkernel/intern/dyntopo.c
index 6cb376447ab..20163fe0848 100644
--- a/source/blender/blenkernel/intern/dyntopo.c
+++ b/source/blender/blenkernel/intern/dyntopo.c
@@ -1980,7 +1980,7 @@ BLI_INLINE int dyntopo_thread_rand(int seed)
return (seed * multiplier + addend) & mask;
}
-ATTR_NO_OPT static void long_edge_queue_task_cb(void *__restrict userdata,
+ static void long_edge_queue_task_cb(void *__restrict userdata,
const int n,
const TaskParallelTLS *__restrict tls)
{
diff --git a/source/blender/bmesh/intern/bmesh_construct.c b/source/blender/bmesh/intern/bmesh_construct.c
index af53abc4ca5..9de715c2b7a 100644
--- a/source/blender/bmesh/intern/bmesh_construct.c
+++ b/source/blender/bmesh/intern/bmesh_construct.c
@@ -1254,7 +1254,7 @@ void bm_update_idmap_cdlayers(BMesh *bm)
bm->idmap.cd_id_off[BM_FACE] = CustomData_get_offset(&bm->pdata, CD_MESH_ID);
}
-ATTR_NO_OPT void bm_rebuild_idmap(BMesh *bm)
+void bm_rebuild_idmap(BMesh *bm)
{
CustomData *cdatas[4] = {
&bm->vdata,
diff --git a/source/blender/bmesh/intern/bmesh_core.c b/source/blender/bmesh/intern/bmesh_core.c
index 45bd35095f8..c1fabab203d 100644
--- a/source/blender/bmesh/intern/bmesh_core.c
+++ b/source/blender/bmesh/intern/bmesh_core.c
@@ -54,7 +54,7 @@
#endif
-ATTR_NO_OPT void bm_elem_check_toolflags(BMesh *bm, BMElem *elem)
+void bm_elem_check_toolflags(BMesh *bm, BMElem *elem)
{
int cd_off = -1;
MToolFlags *flags;
@@ -1783,10 +1783,7 @@ BMFace *bmesh_kernel_split_face_make_edge(BMesh *bm,
*
* \return The newly created BMVert pointer.
*/
-ATTR_NO_OPT BMVert *bmesh_kernel_split_edge_make_vert(BMesh *bm,
- BMVert *tv,
- BMEdge *e,
- BMEdge **r_e)
+BMVert *bmesh_kernel_split_edge_make_vert(BMesh *bm, BMVert *tv, BMEdge *e, BMEdge **r_e)
{
BMLoop *l_next;
BMEdge *e_new;
diff --git a/source/blender/bmesh/intern/bmesh_log.c b/source/blender/bmesh/intern/bmesh_log.c
index 3e08b0edee7..28f64b81ff2 100644
--- a/source/blender/bmesh/intern/bmesh_log.c
+++ b/source/blender/bmesh/intern/bmesh_log.c
@@ -2970,7 +2970,7 @@ void bm_log_print(const BMLog *log, const char *description)
}
#endif
-ATTR_NO_OPT static int bmlog_entry_memsize(BMLogEntry *entry)
+static int bmlog_entry_memsize(BMLogEntry *entry)
{
int ret = 0;
diff --git a/source/blender/bmesh/intern/bmesh_mesh.c b/source/blender/bmesh/intern/bmesh_mesh.c
index ca6f8d16587..f73f2f6f734 100644
--- a/source/blender/bmesh/intern/bmesh_mesh.c
+++ b/source/blender/bmesh/intern/bmesh_mesh.c
@@ -113,7 +113,7 @@ void BM_mesh_elem_toolflags_ensure(BMesh *bm)
bm->totflags = 1;
}
-ATTR_NO_OPT void BM_mesh_elem_toolflags_clear(BMesh *bm)
+void BM_mesh_elem_toolflags_clear(BMesh *bm)
{
bool haveflags = bm->vtoolflagpool || bm->etoolflagpool || bm->ftoolflagpool;
@@ -1709,7 +1709,7 @@ static void bm_alloc_toolflags(BMesh *bm)
CustomData *cdatas[3] = {&bm->vdata, &bm->edata, &bm->pdata};
BLI_mempool *flagpools[3] = {bm->vtoolflagpool, bm->etoolflagpool, bm->ftoolflagpool};
- BLI_mempool *elempools[3] = { bm->vpool, bm->epool, bm->fpool };
+ BLI_mempool *elempools[3] = {bm->vpool, bm->epool, bm->fpool};
for (int i = 0; i < 3; i++) {
CustomData *cdata = cdatas[i];
diff --git a/source/blender/bmesh/intern/bmesh_mods.c b/source/blender/bmesh/intern/bmesh_mods.c
index f0511ee0c99..66dae665dff 100644
--- a/source/blender/bmesh/intern/bmesh_mods.c
+++ b/source/blender/bmesh/intern/bmesh_mods.c
@@ -593,7 +593,7 @@ BMVert *BM_edge_collapse(BMesh *bm,
* \param r_e: The newly created edge.
* \return The new vertex.
*/
-ATTR_NO_OPT BMVert *BM_edge_split(BMesh *bm, BMEdge *e, BMVert *v, BMEdge **r_e, float fac)
+BMVert *BM_edge_split(BMesh *bm, BMEdge *e, BMVert *v, BMEdge **r_e, float fac)
{
BMVert *v_new, *v_other;
BMEdge *e_new;
diff --git a/source/blender/bmesh/intern/bmesh_operator_api.h b/source/blender/bmesh/intern/bmesh_operator_api.h
index 09206794f38..35427d3fa40 100644
--- a/source/blender/bmesh/intern/bmesh_operator_api.h
+++ b/source/blender/bmesh/intern/bmesh_operator_api.h
@@ -69,7 +69,7 @@ extern "C" {
struct GHashIterator;
-ATTR_NO_OPT static BMFlagLayer *BMO_elem_flag_from_header(BMesh *bm, BMElem *ele)
+static BMFlagLayer *BMO_elem_flag_from_header(BMesh *bm, BMElem *ele)
{
int cd_tflags;
diff --git a/source/blender/bmesh/intern/bmesh_operators.c b/source/blender/bmesh/intern/bmesh_operators.c
index f694aa895a5..6c26bb41f4e 100644
--- a/source/blender/bmesh/intern/bmesh_operators.c
+++ b/source/blender/bmesh/intern/bmesh_operators.c
@@ -1252,15 +1252,15 @@ void BMO_slot_buffer_flag_disable(BMesh *bm,
}
}
-ATTR_NO_OPT static void bmo_flag_layer_do(BMesh *bm,
- int new_totflags,
- void (*callback)(BMesh *bm,
- int cd_tflags,
- int itertype,
- int htype,
- int totelem,
- int new_totflags,
- BLI_mempool **pool_ptr))
+static void bmo_flag_layer_do(BMesh *bm,
+ int new_totflags,
+ void (*callback)(BMesh *bm,
+ int cd_tflags,
+ int itertype,
+ int htype,
+ int totelem,
+ int new_totflags,
+ BLI_mempool **pool_ptr))
{
int iters[3] = {BM_VERTS_OF_MESH, BM_EDGES_OF_MESH, BM_FACES_OF_MESH};
int types[3] = {BM_VERT, BM_EDGE, BM_FACE};
@@ -1282,13 +1282,13 @@ ATTR_NO_OPT static void bmo_flag_layer_do(BMesh *bm,
bm->totflags = new_totflags;
}
-ATTR_NO_OPT static void bmo_flag_layer_alloc_do(BMesh *bm,
- int cd_tflags,
- int itertype,
- int htype,
- int totelem,
- int new_totflags,
- BLI_mempool **pool_ptr)
+static void bmo_flag_layer_alloc_do(BMesh *bm,
+ int cd_tflags,
+ int itertype,
+ int htype,
+ int totelem,
+ int new_totflags,
+ BLI_mempool **pool_ptr)
{
BMIter iter;
BMElem *elem;
@@ -1327,26 +1327,26 @@ ATTR_NO_OPT static void bmo_flag_layer_alloc_do(BMesh *bm,
* all operators have been executed. This would
* save a lot of realloc potentially.
*/
-ATTR_NO_OPT static void bmo_flag_layer_alloc(BMesh *bm)
+static void bmo_flag_layer_alloc(BMesh *bm)
{
bmo_flag_layer_do(bm, bm->totflags + 1, bmo_flag_layer_alloc_do);
bm->elem_index_dirty &= ~(BM_VERT | BM_EDGE | BM_FACE);
}
-ATTR_NO_OPT static void bmo_flag_layer_free(BMesh *bm)
+static void bmo_flag_layer_free(BMesh *bm)
{
bmo_flag_layer_do(bm, bm->totflags - 1, bmo_flag_layer_alloc_do);
bm->elem_index_dirty &= ~(BM_VERT | BM_EDGE | BM_FACE);
}
-ATTR_NO_OPT static void bmo_flag_layer_clear_do(BMesh *bm,
- int cd_tflags,
- int itertype,
- int htype,
- int totelem,
- int totflag,
- BLI_mempool **pool_ptr)
+static void bmo_flag_layer_clear_do(BMesh *bm,
+ int cd_tflags,
+ int itertype,
+ int htype,
+ int totelem,
+ int totflag,
+ BLI_mempool **pool_ptr)
{
BMIter iter;
BMElem *elem;
diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index f32edab6f2e..76362b58b1f 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -8482,7 +8482,7 @@ typedef struct DynTopoAutomaskState {
bool free_automasking;
} DynTopoAutomaskState;
-ATTR_NO_OPT static float sculpt_topology_automasking_cb(SculptVertRef vertex, void *vdata)
+static float sculpt_topology_automasking_cb(SculptVertRef vertex, void *vdata)
{
DynTopoAutomaskState *state = (DynTopoAutomaskState *)vdata;
float mask = SCULPT_automasking_factor_get(st
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list