Commit: 9fc73526a0577662ebe86ed794e228a2a0b0e476 Author: Joseph Eagar Date: Thu Feb 2 12:14:55 2023 -0800 Branches: sculpt-dev https://developer.blender.org/rB9fc73526a0577662ebe86ed794e228a2a0b0e476
sculpt-dev: remove optimization flags =================================================================== M source/blender/blenkernel/intern/customdata.cc M source/blender/blenkernel/intern/dyntopo.cc M source/blender/blenkernel/intern/dyntopo_collapse.cc M source/blender/blenkernel/intern/dyntopo_intern.hh M source/blender/blenkernel/intern/paint.cc M source/blender/blenkernel/intern/pbvh.c M source/blender/blenkernel/intern/pbvh_bmesh.c M source/blender/blenlib/intern/smallhash.c M source/blender/bmesh/intern/bmesh_core.c M source/blender/bmesh/intern/bmesh_idmap.cc M source/blender/bmesh/intern/bmesh_log.c M source/blender/bmesh/intern/bmesh_mods.c M source/blender/draw/intern/draw_manager_data.cc M source/blender/draw/intern/draw_pbvh.cc M source/blender/editors/sculpt_paint/sculpt_face_set.cc M source/blender/editors/sculpt_paint/sculpt_smooth.c =================================================================== diff --git a/source/blender/blenkernel/intern/customdata.cc b/source/blender/blenkernel/intern/customdata.cc index f04a78eaa11..45bb3874ede 100644 --- a/source/blender/blenkernel/intern/customdata.cc +++ b/source/blender/blenkernel/intern/customdata.cc @@ -4265,7 +4265,7 @@ void CustomData_bmesh_free_block_data_exclude_by_type(CustomData *data, } #ifndef USE_BMESH_PAGE_CUSTOMDATA -ATTR_NO_OPT static void CustomData_bmesh_set_default_n(CustomData *data, void **block, const int n) +static void CustomData_bmesh_set_default_n(CustomData *data, void **block, const int n) { if (ELEM(data->layers[n].type, CD_TOOLFLAGS, CD_MESH_ID)) { /* do not do toolflags or mesh ids */ @@ -4414,11 +4414,11 @@ void CustomData_bmesh_swap_data(CustomData *source, } } -ATTR_NO_OPT void CustomData_bmesh_copy_data_exclude_by_type(const CustomData *source, - CustomData *dest, - void *src_block, - void **dest_block, - const eCustomDataMask mask_exclude) +void CustomData_bmesh_copy_data_exclude_by_type(const CustomData *source, + CustomData *dest, + void *src_block, + void **dest_block, + const eCustomDataMask mask_exclude) { /* Note that having a version of this function without a 'mask_exclude' * would cause too much duplicate code, so add a check instead. */ @@ -4819,11 +4819,11 @@ void CustomData_bmesh_interp(CustomData *data, } } -ATTR_NO_OPT void CustomData_to_bmesh_block(const CustomData *source, - CustomData *dest, - int src_index, - void **dest_block, - bool use_default_init) +void CustomData_to_bmesh_block(const CustomData *source, + CustomData *dest, + int src_index, + void **dest_block, + bool use_default_init) { if (*dest_block == nullptr) { CustomData_bmesh_alloc_block(dest, dest_block); diff --git a/source/blender/blenkernel/intern/dyntopo.cc b/source/blender/blenkernel/intern/dyntopo.cc index 987bcb1879f..5cef8751343 100644 --- a/source/blender/blenkernel/intern/dyntopo.cc +++ b/source/blender/blenkernel/intern/dyntopo.cc @@ -1393,7 +1393,7 @@ bool check_face_is_tri(PBVH *pbvh, BMFace *f) return false; } -ATTR_NO_OPT bool destroy_nonmanifold_fins(PBVH *pbvh, BMEdge *e_root) +bool destroy_nonmanifold_fins(PBVH *pbvh, BMEdge *e_root) { #if !(DYNTOPO_DISABLE_FLAG & DYNTOPO_DISABLE_FIN_REMOVAL) bm_logstack_push(); @@ -3163,12 +3163,12 @@ static const int splitmap[43][16] = { {6, -1, 3, -1, 5, -1, 1}, // 42 0 1 0 1 0 1 }; -ATTR_NO_OPT static void pbvh_split_edges(EdgeQueueContext *eq_ctx, - PBVH *pbvh, - BMesh *bm, - BMEdge **edges1, - int totedge, - bool ignore_isolated_edges) +static void pbvh_split_edges(EdgeQueueContext *eq_ctx, + PBVH *pbvh, + BMesh *bm, + BMEdge **edges1, + int totedge, + bool ignore_isolated_edges) { bm_logstack_push(); bm_log_message(" == split edges == "); diff --git a/source/blender/blenkernel/intern/dyntopo_collapse.cc b/source/blender/blenkernel/intern/dyntopo_collapse.cc index 029c8a873aa..fc0bde30209 100644 --- a/source/blender/blenkernel/intern/dyntopo_collapse.cc +++ b/source/blender/blenkernel/intern/dyntopo_collapse.cc @@ -138,7 +138,7 @@ inline bool bm_edge_collapse_is_degenerate_topology(BMEdge *e_first) /* Faces *outside* the ring region are tagged with facetag, used to detect * border edges. */ -ATTR_NO_OPT static void vert_ring_do_tag(BMVert *v, int tag, int facetag, int depth) +static void vert_ring_do_tag(BMVert *v, int tag, int facetag, int depth) { BMEdge *e = v->e; @@ -178,7 +178,7 @@ ATTR_NO_OPT static void vert_ring_do_tag(BMVert *v, int tag, int facetag, int de } while ((e = BM_DISK_EDGE_NEXT(e, v)) != v->e); } -ATTR_NO_OPT static void vert_ring_untag_inner_faces(BMVert *v, int tag, int facetag, int depth) +static void vert_ring_untag_inner_faces(BMVert *v, int tag, int facetag, int depth) { if (!v->e) { return; @@ -205,12 +205,12 @@ ATTR_NO_OPT static void vert_ring_untag_inner_faces(BMVert *v, int tag, int face } while ((e = BM_DISK_EDGE_NEXT(e, v)) != v->e); } -ATTR_NO_OPT void vert_ring_do_apply(BMVert *v, - std::function<void(BMElem *elem, void *userdata)> callback, - void *userdata, - int tag, - int facetag, - int depth) +void vert_ring_do_apply(BMVert *v, + std::function<void(BMElem *elem, void *userdata)> callback, + void *userdata, + int tag, + int facetag, + int depth) { BMEdge *e = v->e; @@ -265,7 +265,7 @@ ATTR_NO_OPT void vert_ring_do_apply(BMVert *v, const int COLLAPSE_TAG = BM_ELEM_INTERNAL_TAG; const int COLLAPSE_FACE_TAG = BM_ELEM_TAG_ALT; -ATTR_NO_OPT static void collapse_ring_callback_pre(BMElem *elem, void *userdata) +static void collapse_ring_callback_pre(BMElem *elem, void *userdata) { TraceData *data = static_cast<TraceData *>(userdata); @@ -296,7 +296,7 @@ ATTR_NO_OPT static void collapse_ring_callback_pre(BMElem *elem, void *userdata) } } -ATTR_NO_OPT static void check_new_elem_id(BMElem *elem, TraceData *data) +static void check_new_elem_id(BMElem *elem, TraceData *data) { int id = BM_ELEM_CD_GET_INT(elem, data->pbvh->bm_idmap->cd_id_off[elem->head.htype]); if (id >= 0) { @@ -319,7 +319,7 @@ ATTR_NO_OPT static void check_new_elem_id(BMElem *elem, TraceData *data) } } -ATTR_NO_OPT static void collapse_ring_callback_post(BMElem *elem, void *userdata) +static void collapse_ring_callback_post(BMElem *elem, void *userdata) { TraceData *data = static_cast<TraceData *>(userdata); @@ -370,13 +370,13 @@ static void edge_ring_do_old(BMEdge *e, vert_ring_do_apply(e->v2, callback, userdata, tag, facetag, depth); } -ATTR_NO_OPT static void vert_ring_do(BMVert *v, - BMVert *v_extra, - void (*callback)(BMElem *elem, void *userdata), - void *userdata, - int tag, - int facetag, - int depth) +static void vert_ring_do(BMVert *v, + BMVert *v_extra, + void (*callback)(BMElem *elem, void *userdata), + void *userdata, + int tag, + int facetag, + int depth) { blender::Set<BMFace *, 128> faces; @@ -466,7 +466,7 @@ ATTR_NO_OPT static void vert_ring_do(BMVert *v, } } -ATTR_NO_OPT bool pbvh_bmesh_collapse_edge_uvs( +bool pbvh_bmesh_collapse_edge_uvs( PBVH *pbvh, BMEdge *e, BMVert *v_conn, BMVert *v_del, EdgeQueueContext *eq_ctx) { bm_logstack_push(); @@ -626,13 +626,13 @@ ATTR_NO_OPT bool pbvh_bmesh_collapse_edge_uvs( * This function is rather complicated. It has to * snap UVs, log geometry and free ids. */ -ATTR_NO_OPT BMVert *pbvh_bmesh_collapse_edge(PBVH *pbvh, - BMEdge *e, - BMVert *v1, - BMVert *v2, - GHash *deleted_verts, - BLI_Buffer *deleted_faces, - EdgeQueueContext *eq_ctx) +BMVert *pbvh_bmesh_collapse_edge(PBVH *pbvh, + BMEdge *e, + BMVert *v1, + BMVert *v2, + GHash *deleted_verts, + BLI_Buffer *deleted_faces, + EdgeQueueContext *eq_ctx) { bm_logstack_push(); diff --git a/source/blender/blenkernel/intern/dyntopo_intern.hh b/source/blender/blenkernel/intern/dyntopo_intern.hh index 56d610bec70..277b6f42784 100644 --- a/source/blender/blenkernel/intern/dyntopo_intern.hh +++ b/source/blender/blenkernel/intern/dyntopo_intern.hh @@ -237,13 +237,13 @@ bool destroy_nonmanifold_fins(PBVH *pbvh, BMEdge *e_root); bool check_face_is_tri(PBVH *pbvh, BMFace *f); bool check_vert_fan_are_tris(PBVH *pbvh, BMVert *v); -ATTR_NO_OPT BMVert *pbvh_bmesh_collapse_edge(PBVH *pbvh, - BMEdge *e, - BMVert *v1, - BMVert *v2, - struct GHash *deleted_verts, - struct BLI_Buffer *deleted_faces, - struct EdgeQueueContext *eq_ctx); +BMVert *pbvh_bmesh_collapse_edge(PBVH *pbvh, + BMEdge *e, + BMVert *v1, + BMVert *v2, + struct GHash *deleted_verts, + struct BLI_Buffer *deleted_faces, + struct EdgeQueueContext *eq_ctx); extern "C" void bm_log_message(const char *fmt, ...); void pbvh_bmesh_vert @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs