blender
/
blender
136
405
Fork 586
Code Issues 6.2k Pull Requests 759 Projects 19 Wiki Activity

Sculpt-dev: Fix invalid prototype and remove 

a bunch of ATTR_NO_OPTs
This commit is contained in:
Joseph Eagar 2022-03-14 10:50:20 -07:00
parent 389724c1ac
commit 891b8797ed
5 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -205,7 +205,7 @@ void bmesh_radial_loop_append(BMEdge *e, BMLoop *l);
void bm_kill_only_edge(BMesh *bm, BMEdge *e);
void bm_kill_only_loop(BMesh *bm, BMLoop *l);
void bm_kill_only_face(BMesh *bm, BMFace *f);
bool edge_queue_test(struct EdgeQueueContext *eq_ctx, PBVH *pbvh, BMEdge *e);
static bool edge_queue_test(struct EdgeQueueContext *eq_ctx, PBVH *pbvh, BMEdge *e);
static void fix_mesh(PBVH *pbvh, BMesh *bm)
{

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

@ -2435,7 +2435,7 @@ char *_last_local_obj = NULL;
# define JVKE_CHECK_ELEMENT(elem)
#endif
ATTR_NO_OPT static bool cleanup_vert(BMesh *bm, BMVert *v, const BMTracer *tracer)
static bool cleanup_vert(BMesh *bm, BMVert *v, const BMTracer *tracer)
{
BMEdge *e = v->e;
@ -2477,7 +2477,7 @@ ATTR_NO_OPT static bool cleanup_vert(BMesh *bm, BMVert *v, const BMTracer *trace
BMFace *f = BM_face_create_quad_tri(bm, v1, v2, v3, NULL, f_example, BM_CREATE_NOP);
BMLoop *l = f->l_first;
//ensure correct winding
// ensure correct winding
do {
if (l->radial_next != l && l->radial_next->v == l->v) {
BM_face_normal_flip(bm, f);
@ -2494,7 +2494,7 @@ ATTR_NO_OPT static bool cleanup_vert(BMesh *bm, BMVert *v, const BMTracer *trace
return true;
}
ATTR_NO_OPT static void bmesh_kernel_check_val3_vert(BMesh *bm, BMEdge *e, const BMTracer *tracer)
static void bmesh_kernel_check_val3_vert(BMesh *bm, BMEdge *e, const BMTracer *tracer)
{
if (!e->l) {
return;
@ -2528,12 +2528,12 @@ ATTR_NO_OPT static void bmesh_kernel_check_val3_vert(BMesh *bm, BMEdge *e, const
} while (!stop);
}
ATTR_NO_OPT BMVert *bmesh_kernel_join_vert_kill_edge(BMesh *bm,
BMEdge *e,
BMVert *v_kill,
const bool do_del,
const bool combine_flags,
const BMTracer *tracer)
BMVert *bmesh_kernel_join_vert_kill_edge(BMesh *bm,
BMEdge *e,
BMVert *v_kill,
const bool do_del,
const bool combine_flags,
const BMTracer *tracer)
{
BMVert *v_conn = BM_edge_other_vert(e, v_kill);
@ -3015,13 +3015,13 @@ ATTR_NO_OPT BMVert *bmesh_kernel_join_vert_kill_edge(BMesh *bm,
}
/*original version of bmesh_kernel_join_vert_kill_edge*/
ATTR_NO_OPT BMVert *bmesh_kernel_join_vert_kill_edge_fast(BMesh *bm,
BMEdge *e_kill,
BMVert *v_kill,
const bool do_del,
const bool check_edge_exists,
const bool kill_degenerate_faces,
const bool combine_flags)
BMVert *bmesh_kernel_join_vert_kill_edge_fast(BMesh *bm,
BMEdge *e_kill,
BMVert *v_kill,
const bool do_del,
const bool check_edge_exists,
const bool kill_degenerate_faces,
const bool combine_flags)
{
BLI_SMALLSTACK_DECLARE(faces_degenerate, BMFace *);
BMVert *v_target = BM_edge_other_vert(e_kill, v_kill);
@ -3102,7 +3102,7 @@ ATTR_NO_OPT BMVert *bmesh_kernel_join_vert_kill_edge_fast(BMesh *bm,
return v_target;
}
ATTR_NO_OPT BMFace *bmesh_kernel_join_face_kill_edge(BMesh *bm, BMFace *f1, BMFace *f2, BMEdge *e)
BMFace *bmesh_kernel_join_face_kill_edge(BMesh *bm, BMFace *f1, BMFace *f2, BMEdge *e)
{
BMLoop *l_iter, *l_f1 = NULL, *l_f2 = NULL;
int newlen = 0, i, f1len = 0, f2len = 0;

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

@ -616,7 +616,7 @@ static uint bm_log_vert_id_get(BMLog *log, BMVert *v)
}
/*Get a vertex from its unique ID */
ATTR_NO_OPT static BMElem *bm_log_elem_from_id(BMLog *log, uint id)
static BMElem *bm_log_elem_from_id(BMLog *log, uint id)
{
if (log->bm->idmap.map && id >= ((unsigned int)log->bm->idmap.map_size)) {
return NULL;
@ -626,7 +626,7 @@ ATTR_NO_OPT static BMElem *bm_log_elem_from_id(BMLog *log, uint id)
}
/* Get a vertex from its unique ID */
ATTR_NO_OPT static BMVert *bm_log_vert_from_id(BMLog *log, uint id)
static BMVert *bm_log_vert_from_id(BMLog *log, uint id)
{
if (log->bm->idmap.map && id >= ((unsigned int)log->bm->idmap.map_size)) {
return NULL;
@ -3627,7 +3627,7 @@ int type_idx_map[] = {
3, // 8 BM_FACE
};
ATTR_NO_OPT static GHash *bm_clone_ghash(BMLogEntry *entry, GHash *ghash, int type)
static GHash *bm_clone_ghash(BMLogEntry *entry, GHash *ghash, int type)
{
GHash *ghash2 = BLI_ghash_new(logkey_hash, logkey_cmp, __func__);
@ -3694,7 +3694,7 @@ ATTR_NO_OPT static GHash *bm_clone_ghash(BMLogEntry *entry, GHash *ghash, int ty
return ghash2;
}
ATTR_NO_OPT static BMLogEntry *bm_log_entry_clone_intern(BMLogEntry *entry, BMLog *newlog)
static BMLogEntry *bm_log_entry_clone_intern(BMLogEntry *entry, BMLog *newlog)
{
BMLogEntry *newentry = MEM_callocN(sizeof(*entry), "BMLogEntry cloned");
@ -3739,7 +3739,7 @@ ATTR_NO_OPT static BMLogEntry *bm_log_entry_clone_intern(BMLogEntry *entry, BMLo
return newentry;
}
ATTR_NO_OPT static BMLogEntry *bm_log_entry_clone(BMLogEntry *entry, BMLog *newlog)
static BMLogEntry *bm_log_entry_clone(BMLogEntry *entry, BMLog *newlog)
{
BMLogEntry *cur = entry;
BMLogEntry *ret = NULL;
@ -3766,7 +3766,7 @@ ATTR_NO_OPT static BMLogEntry *bm_log_entry_clone(BMLogEntry *entry, BMLog *newl
#include <stdarg.h>
ATTR_NO_OPT static void debuglog(const char *fmt, ...)
static void debuglog(const char *fmt, ...)
{
va_list args;
va_start(args, fmt);
@ -3850,7 +3850,7 @@ static bool bm_check_ghash_set(
return ok;
}
ATTR_NO_OPT static bool bm_log_validate_intern(
static bool bm_log_validate_intern(
BMesh *bm, BMLog *newlog, BMLogEntry *srcEntry, bool is_applied, bool do_apply)
{
bool precopy = do_apply;
@ -3946,12 +3946,12 @@ ATTR_NO_OPT static bool bm_log_validate_intern(
return ok;
}
ATTR_NO_OPT bool BM_log_validate_cur(BMLog *log)
bool BM_log_validate_cur(BMLog *log)
{
return BM_log_validate(log->bm, log->current_entry, false);
}
ATTR_NO_OPT bool BM_log_validate(BMesh *inbm, BMLogEntry *entry, bool is_applied)
bool BM_log_validate(BMesh *inbm, BMLogEntry *entry, bool is_applied)
{
return bm_log_validate_intern(inbm, entry->log, entry, is_applied, false);

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

@ -397,7 +397,7 @@ void bmesh_radial_loop_append(BMEdge *e, BMLoop *l)
l->e = e;
}
ATTR_NO_OPT void bmesh_radial_loop_remove(BMEdge *e, BMLoop *l)
void bmesh_radial_loop_remove(BMEdge *e, BMLoop *l)
{
/* if e is non-NULL, l must be in the radial cycle of e */
if (UNLIKELY(e != l->e)) {

2
source/blender/bmesh/operators/bmo_removedoubles.c
View File

@ -443,7 +443,7 @@ void bmo_pointmerge_exec(BMesh *bm, BMOperator *op)
#define USE_BM_EDGE_COLLAPSE
ATTR_NO_OPT void bmo_collapse_exec(BMesh *bm, BMOperator *op)
void bmo_collapse_exec(BMesh *bm, BMOperator *op)
{
BMOperator weldop;
BMWalker walker;