blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 753 Projects 19 Wiki Activity

Remove debugging ATTR_NO_OPTS

This commit is contained in:
Joseph Eagar 2021-10-04 00:10:18 -07:00
parent e32bcbd7e8
commit 4e2a5c5562
11 changed files with 58 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenkernel/intern/customdata.c
View File

@ -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);

2
source/blender/blenkernel/intern/dyntopo.c
View File

@ -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)
{

2
source/blender/bmesh/intern/bmesh_construct.c
View File

@ -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,

7
source/blender/bmesh/intern/bmesh_core.c
View File

@ -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;

2
source/blender/bmesh/intern/bmesh_log.c
View File

@ -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;

4
source/blender/bmesh/intern/bmesh_mesh.c
View File

@ -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];

2
source/blender/bmesh/intern/bmesh_mods.c
View File

@ -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;

2
source/blender/bmesh/intern/bmesh_operator_api.h
View File

@ -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;

50
source/blender/bmesh/intern/bmesh_operators.c
View File

@ -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;

4
source/blender/editors/sculpt_paint/sculpt.c
View File

@ -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(state->cache, state->ss, vertex);
@ -8491,7 +8491,7 @@ ATTR_NO_OPT static float sculpt_topology_automasking_cb(SculptVertRef vertex, vo
return mask * mask2;
}
ATTR_NO_OPT static float sculpt_topology_automasking_mask_cb(SculptVertRef vertex, void *vdata)
static float sculpt_topology_automasking_mask_cb(SculptVertRef vertex, void *vdata)
{
DynTopoAutomaskState *state = (DynTopoAutomaskState *)vdata;
return 1.0f - SCULPT_vertex_mask_get(state->ss, vertex);

42
source/blender/editors/sculpt_paint/sculpt_face_set.c
View File

@ -2050,11 +2050,11 @@ static void sculpt_bm_mesh_elem_hflag_disable_all(BMesh *bm, char htype, char hf
}
}
ATTR_NO_OPT static void sculpt_face_set_extrude_id(Object *ob,
bool no_islands,
SculptSession *ss,
const int active_face_set_id,
FaceSetExtrudeCD *fsecd)
static void sculpt_face_set_extrude_id(Object *ob,
bool no_islands,
SculptSession *ss,
const int active_face_set_id,
FaceSetExtrudeCD *fsecd)
{
Mesh *mesh = ob->data;
@ -2503,12 +2503,12 @@ ATTR_NO_OPT static void sculpt_face_set_extrude_id(Object *ob,
}
}
ATTR_NO_OPT static void island_stack_bmesh_do(SculptSession *ss,
int fset,
SculptFaceRef face,
SculptFaceRef **r_faces,
int *r_totfaces,
BLI_bitmap *visit)
static void island_stack_bmesh_do(SculptSession *ss,
int fset,
SculptFaceRef face,
SculptFaceRef **r_faces,
int *r_totfaces,
BLI_bitmap *visit)
{
BMFace **faces = (BMFace **)*r_faces;
BLI_array_declare(faces);
@ -2537,12 +2537,12 @@ ATTR_NO_OPT static void island_stack_bmesh_do(SculptSession *ss,
*r_faces = (SculptFaceRef *)faces;
}
ATTR_NO_OPT static void island_stack_mesh_do(SculptSession *ss,
int fset,
SculptFaceRef face,
SculptFaceRef **r_faces,
int *r_totfaces,
BLI_bitmap *visit)
static void island_stack_mesh_do(SculptSession *ss,
int fset,
SculptFaceRef face,
SculptFaceRef **r_faces,
int *r_totfaces,
BLI_bitmap *visit)
{
SculptFaceRef *faces = *r_faces;
BLI_array_declare(faces);
@ -2570,7 +2570,7 @@ ATTR_NO_OPT static void island_stack_mesh_do(SculptSession *ss,
*r_totfaces = BLI_array_len(faces);
*r_faces = (SculptFaceRef *)faces;
}
ATTR_NO_OPT SculptFaceSetIslands *SCULPT_face_set_islands_get(SculptSession *ss, int fset)
SculptFaceSetIslands *SCULPT_face_set_islands_get(SculptSession *ss, int fset)
{
if (!ss->epmap) {
BKE_mesh_edge_poly_map_create(&ss->epmap,
@ -2645,7 +2645,7 @@ ATTR_NO_OPT SculptFaceSetIslands *SCULPT_face_set_islands_get(SculptSession *ss,
return ret;
}
ATTR_NO_OPT void SCULPT_face_set_islands_free(SculptSession *ss, SculptFaceSetIslands *islands)
void SCULPT_face_set_islands_free(SculptSession *ss, SculptFaceSetIslands *islands)
{
for (int i = 0; i < islands->totisland; i++) {
MEM_SAFE_FREE(islands->islands[i].faces);
@ -2655,9 +2655,7 @@ ATTR_NO_OPT void SCULPT_face_set_islands_free(SculptSession *ss, SculptFaceSetIs
MEM_SAFE_FREE(islands);
}
ATTR_NO_OPT SculptFaceSetIsland *SCULPT_face_set_island_get(SculptSession *ss,
SculptFaceRef face,
int fset)
SculptFaceSetIsland *SCULPT_face_set_island_get(SculptSession *ss, SculptFaceRef face, int fset)
{
SculptFaceSetIslands *islands = SCULPT_face_set_islands_get(ss, fset);