blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 778 Projects 19 Wiki Activity

Remove ATTR_NO_OPTs

This commit is contained in:
Joseph Eagar 2021-09-30 11:03:19 -07:00
parent be004d8e7e
commit 02f1982e7d
4 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/blenkernel/intern/brush_engine.c
View File

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

12
source/blender/blenkernel/intern/paint.c
View File

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

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

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

2
source/blender/editors/sculpt_paint/sculpt_intern.h
View File

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