blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Get rid of various __attribute__((optnone)) I had scattered throughout 

the code
This commit is contained in:
Joseph Eagar 2021-04-11 19:29:06 -07:00
parent 7f14d519c0
commit a527bd5f48
4 changed files with 25 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
source/blender/blenkernel/intern/brush.c
View File

@ -1778,6 +1778,8 @@ void BKE_brush_sculpt_reset(Brush *br)
case SCULPT_TOOL_SNAKE_HOOK:
br->alpha = 1.0f;
br->rake_factor = 1.0f;
br->dyntopo.inherit = DYNTOPO_INHERIT_BITMASK & ~(DYNTOPO_INHERIT_ALL | DYNTOPO_COLLAPSE);
br->dyntopo.flag |= DYNTOPO_COLLAPSE;
break;
case SCULPT_TOOL_THUMB:
br->size = 75;
@ -1891,7 +1893,7 @@ void BKE_brush_sculpt_reset(Brush *br)
}
if (disable_dyntopo) {
//disabled flag is never inherited
// disabled flag is never inherited
br->dyntopo.flag |= DYNTOPO_DISABLED;
}
@ -1951,8 +1953,9 @@ void BKE_brush_sculpt_reset(Brush *br)
break;
case SCULPT_TOOL_SIMPLIFY:
br->dyntopo.inherit = ((1<<17)-1) & ~(DYNTOPO_INHERIT_ALL|DYNTOPO_SUBDIVIDE|DYNTOPO_COLLAPSE);
br->dyntopo.flag |= DYNTOPO_COLLAPSE|DYNTOPO_SUBDIVIDE;
br->dyntopo.inherit = DYNTOPO_INHERIT_BITMASK &
~(DYNTOPO_INHERIT_ALL | DYNTOPO_SUBDIVIDE | DYNTOPO_COLLAPSE);
br->dyntopo.flag |= DYNTOPO_COLLAPSE | DYNTOPO_SUBDIVIDE;
br->autosmooth_factor = 0.02;
case SCULPT_TOOL_VCOL_BOUNDARY:
case SCULPT_TOOL_PAINT:
@ -2597,10 +2600,10 @@ void BKE_brush_get_dyntopo(Brush *brush, Sculpt *sd, DynTopoSettings *out)
// detect unconverted file data
if (!out->inherit && !out->detail_range) {
//reload default dyntopo settings
// reload default dyntopo settings
Brush brush2 = *brush;
//don't copy heap allocd data
// don't copy heap allocd data
brush2.curve = NULL;
brush2.icon_imbuf = NULL;
brush2.gpencil_settings = NULL;
@ -2611,7 +2614,7 @@ void BKE_brush_get_dyntopo(Brush *brush, Sculpt *sd, DynTopoSettings *out)
brush->dyntopo = *out = brush2.dyntopo;
brush_free_data((ID*)&brush2);
brush_free_data((ID *)&brush2);
}
int inherit = out->inherit;

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

@ -3818,7 +3818,7 @@ void CustomData_bmesh_set_default(CustomData *data, void **block)
}
}
__attribute__((optnone)) void CustomData_bmesh_swap_data(CustomData *source,
void CustomData_bmesh_swap_data(CustomData *source,
CustomData *dest,
void *src_block,
void **dest_block)
@ -3882,7 +3882,7 @@ __attribute__((optnone)) void CustomData_bmesh_swap_data(CustomData *source,
}
}
__attribute__ ((optnone)) void CustomData_bmesh_copy_data_exclude_by_type(const CustomData *source,
void CustomData_bmesh_copy_data_exclude_by_type(const CustomData *source,
CustomData *dest,
void *src_block,
void **dest_block,

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

@ -3275,7 +3275,7 @@ bool BKE_pbvh_bmesh_update_topology_nodes(PBVH *pbvh,
return modified;
}
__attribute__((optnone)) static bool cleanup_valence_3_4(PBVH *pbvh,
static bool cleanup_valence_3_4(PBVH *pbvh,
const float center[3],
const float view_normal[3],
float radius,

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

@ -257,7 +257,7 @@ static BMFace *bm_log_face_from_id(BMLog *log, uint id)
/************************ BMLogVert / BMLogFace ***********************/
__attribute__((optnone)) static void bm_log_vert_customdata(
static void bm_log_vert_customdata(
BMesh *bm, BMLog *log, BMLogEntry *entry, BMVert *v, BMLogVert *lv)
{
#ifdef CUSTOMDATA
@ -329,12 +329,12 @@ static void vert_mask_set(BMVert *v, const float new_mask, const int cd_vert_mas
}
/* Update a BMLogVert with data from a BMVert */
__attribute__((optnone)) static void bm_log_vert_bmvert_copy(BMLog *log,
BMLog *entry,
BMLogVert *lv,
BMVert *v,
const int cd_vert_mask_offset,
bool copy_customdata)
static void bm_log_vert_bmvert_copy(BMLog *log,
BMLog *entry,
BMLogVert *lv,
BMVert *v,
const int cd_vert_mask_offset,
bool copy_customdata)
{
copy_v3_v3(lv->co, v->co);
normal_float_to_short_v3(lv->no, v->no);
@ -384,10 +384,7 @@ static BMLogFace *bm_log_face_alloc(BMLog *log, BMFace *f)
/************************ Helpers for undo/redo ***********************/
__attribute__((optnone)) static void bm_log_verts_unmake(BMesh *bm,
BMLog *log,
GHash *verts,
BMLogEntry *entry)
static void bm_log_verts_unmake(BMesh *bm, BMLog *log, GHash *verts, BMLogEntry *entry)
{
const int cd_vert_mask_offset = CustomData_get_offset(&bm->vdata, CD_PAINT_MASK);
@ -438,10 +435,7 @@ static void bm_log_faces_unmake(BMesh *bm, BMLog *log, GHash *faces, BMLogEntry
}
}
__attribute__((optnone)) static void bm_log_verts_restore(BMesh *bm,
BMLog *log,
GHash *verts,
BMLogEntry *entry)
static void bm_log_verts_restore(BMesh *bm, BMLog *log, GHash *verts, BMLogEntry *entry)
{
const int cd_vert_mask_offset = CustomData_get_offset(&bm->vdata, CD_PAINT_MASK);
@ -497,10 +491,7 @@ static void bm_log_faces_restore(BMesh *bm, BMLog *log, GHash *faces, BMLogEntry
}
}
__attribute__((optnone)) static void bm_log_vert_values_swap(BMesh *bm,
BMLog *log,
GHash *verts,
BMLogEntry *entry)
static void bm_log_vert_values_swap(BMesh *bm, BMLog *log, GHash *verts, BMLogEntry *entry)
{
const int cd_vert_mask_offset = CustomData_get_offset(&bm->vdata, CD_PAINT_MASK);
@ -1062,7 +1053,8 @@ static void bm_log_undo_intern(BMesh *bm, BMLog *log, BMLogEntry *entry)
bm_log_face_values_swap(log, entry->modified_faces, entry);
}
void BM_log_undo(BMesh *bm, BMLog *log) {
void BM_log_undo(BMesh *bm, BMLog *log)
{
BMLogEntry *entry = log->current_entry;
log->bm = bm;
@ -1249,9 +1241,7 @@ void BM_log_face_added(BMLog *log, BMFace *f)
* If there's a move record for the vertex, that's used as the
* vertices original location, then the move record is deleted.
*/
__attribute__((optnone)) void BM_log_vert_removed(BMLog *log,
BMVert *v,
const int cd_vert_mask_offset)
void BM_log_vert_removed(BMLog *log, BMVert *v, const int cd_vert_mask_offset)
{
BMLogEntry *entry = log->current_entry;
uint v_id = bm_log_vert_id_get(log, v);