diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:17:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:21:24 +0300 |
commit | e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch) | |
tree | 8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/bmesh/intern/bmesh_marking.h | |
parent | b3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff) |
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211.
For details on usage and instructions for migrating branches
without conflicts, see:
https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/bmesh/intern/bmesh_marking.h')
-rw-r--r-- | source/blender/bmesh/intern/bmesh_marking.h | 101 |
1 files changed, 61 insertions, 40 deletions
diff --git a/source/blender/bmesh/intern/bmesh_marking.h b/source/blender/bmesh/intern/bmesh_marking.h index a7416b484d7..06314a7a388 100644 --- a/source/blender/bmesh/intern/bmesh_marking.h +++ b/source/blender/bmesh/intern/bmesh_marking.h @@ -22,9 +22,9 @@ */ typedef struct BMEditSelection { - struct BMEditSelection *next, *prev; - BMElem *ele; - char htype; + struct BMEditSelection *next, *prev; + BMElem *ele; + char htype; } BMEditSelection; /* geometry hiding code */ @@ -37,19 +37,27 @@ void BM_face_hide_set(BMFace *f, const bool hide); /* Selection code */ void BM_elem_select_set(BMesh *bm, BMElem *ele, const bool select); -void BM_mesh_elem_hflag_enable_test( - BMesh *bm, const char htype, const char hflag, - const bool respecthide, const bool overwrite, const char hflag_test); -void BM_mesh_elem_hflag_disable_test( - BMesh *bm, const char htype, const char hflag, - const bool respecthide, const bool overwrite, const char hflag_test); - -void BM_mesh_elem_hflag_enable_all( - BMesh *bm, const char htype, const char hflag, - const bool respecthide); -void BM_mesh_elem_hflag_disable_all( - BMesh *bm, const char htype, const char hflag, - const bool respecthide); +void BM_mesh_elem_hflag_enable_test(BMesh *bm, + const char htype, + const char hflag, + const bool respecthide, + const bool overwrite, + const char hflag_test); +void BM_mesh_elem_hflag_disable_test(BMesh *bm, + const char htype, + const char hflag, + const bool respecthide, + const bool overwrite, + const char hflag_test); + +void BM_mesh_elem_hflag_enable_all(BMesh *bm, + const char htype, + const char hflag, + const bool respecthide); +void BM_mesh_elem_hflag_disable_all(BMesh *bm, + const char htype, + const char hflag, + const bool respecthide); /* individual element select functions, BM_elem_select_set is a shortcut for these * that automatically detects which one to use*/ @@ -71,37 +79,46 @@ void BM_mesh_select_mode_flush(BMesh *bm); void BM_mesh_deselect_flush(BMesh *bm); void BM_mesh_select_flush(BMesh *bm); -int BM_mesh_elem_hflag_count_enabled(BMesh *bm, const char htype, const char hflag, const bool respecthide); -int BM_mesh_elem_hflag_count_disabled(BMesh *bm, const char htype, const char hflag, const bool respecthide); +int BM_mesh_elem_hflag_count_enabled(BMesh *bm, + const char htype, + const char hflag, + const bool respecthide); +int BM_mesh_elem_hflag_count_disabled(BMesh *bm, + const char htype, + const char hflag, + const bool respecthide); /* edit selection stuff */ -void BM_mesh_active_face_set(BMesh *bm, BMFace *f); +void BM_mesh_active_face_set(BMesh *bm, BMFace *f); BMFace *BM_mesh_active_face_get(BMesh *bm, const bool is_sloppy, const bool is_selected); BMEdge *BM_mesh_active_edge_get(BMesh *bm); BMVert *BM_mesh_active_vert_get(BMesh *bm); BMElem *BM_mesh_active_elem_get(BMesh *bm); -void BM_editselection_center(BMEditSelection *ese, float r_center[3]); -void BM_editselection_normal(BMEditSelection *ese, float r_normal[3]); -void BM_editselection_plane(BMEditSelection *ese, float r_plane[3]); +void BM_editselection_center(BMEditSelection *ese, float r_center[3]); +void BM_editselection_normal(BMEditSelection *ese, float r_normal[3]); +void BM_editselection_plane(BMEditSelection *ese, float r_plane[3]); -#define BM_select_history_check(bm, ele) _bm_select_history_check(bm, &(ele)->head) -#define BM_select_history_remove(bm, ele) _bm_select_history_remove(bm, &(ele)->head) +#define BM_select_history_check(bm, ele) _bm_select_history_check(bm, &(ele)->head) +#define BM_select_history_remove(bm, ele) _bm_select_history_remove(bm, &(ele)->head) #define BM_select_history_store_notest(bm, ele) _bm_select_history_store_notest(bm, &(ele)->head) -#define BM_select_history_store(bm, ele) _bm_select_history_store(bm, &(ele)->head) -#define BM_select_history_store_head_notest(bm, ele) _bm_select_history_store_head_notest(bm, &(ele)->head) -#define BM_select_history_store_head(bm, ele) _bm_select_history_store_head(bm, &(ele)->head) -#define BM_select_history_store_after_notest(bm, ese_ref, ele) _bm_select_history_store_after_notest(bm, ese_ref, &(ele)->head) -#define BM_select_history_store_after(bm, ese, ese_ref) _bm_select_history_store_after(bm, ese_ref, &(ele)->head) - -bool _bm_select_history_check(BMesh *bm, const BMHeader *ele); -bool _bm_select_history_remove(BMesh *bm, BMHeader *ele); +#define BM_select_history_store(bm, ele) _bm_select_history_store(bm, &(ele)->head) +#define BM_select_history_store_head_notest(bm, ele) \ + _bm_select_history_store_head_notest(bm, &(ele)->head) +#define BM_select_history_store_head(bm, ele) _bm_select_history_store_head(bm, &(ele)->head) +#define BM_select_history_store_after_notest(bm, ese_ref, ele) \ + _bm_select_history_store_after_notest(bm, ese_ref, &(ele)->head) +#define BM_select_history_store_after(bm, ese, ese_ref) \ + _bm_select_history_store_after(bm, ese_ref, &(ele)->head) + +bool _bm_select_history_check(BMesh *bm, const BMHeader *ele); +bool _bm_select_history_remove(BMesh *bm, BMHeader *ele); void _bm_select_history_store_notest(BMesh *bm, BMHeader *ele); -void _bm_select_history_store(BMesh *bm, BMHeader *ele); +void _bm_select_history_store(BMesh *bm, BMHeader *ele); void _bm_select_history_store_head_notest(BMesh *bm, BMHeader *ele); -void _bm_select_history_store_head(BMesh *bm, BMHeader *ele); -void _bm_select_history_store_after(BMesh *bm, BMEditSelection *ese_ref, BMHeader *ele); -void _bm_select_history_store_after_notest(BMesh *bm, BMEditSelection *ese_ref, BMHeader *ele); +void _bm_select_history_store_head(BMesh *bm, BMHeader *ele); +void _bm_select_history_store_after(BMesh *bm, BMEditSelection *ese_ref, BMHeader *ele); +void _bm_select_history_store_after_notest(BMesh *bm, BMEditSelection *ese_ref, BMHeader *ele); void BM_select_history_validate(BMesh *bm); void BM_select_history_clear(BMesh *bm); @@ -109,12 +126,16 @@ bool BM_select_history_active_get(BMesh *bm, struct BMEditSelection *ese); struct GHash *BM_select_history_map_create(BMesh *bm); void BM_select_history_merge_from_targetmap( - BMesh *bm, GHash *vert_map, GHash *edge_map, GHash *face_map, const bool use_chain); + BMesh *bm, GHash *vert_map, GHash *edge_map, GHash *face_map, const bool use_chain); -#define BM_SELECT_HISTORY_BACKUP(bm) { \ - ListBase _bm_prev_selected = (bm)->selected; BLI_listbase_clear(&(bm)->selected) +#define BM_SELECT_HISTORY_BACKUP(bm) \ + { \ + ListBase _bm_prev_selected = (bm)->selected; \ + BLI_listbase_clear(&(bm)->selected) #define BM_SELECT_HISTORY_RESTORE(bm) \ - (bm)->selected = _bm_prev_selected; } (void)0 + (bm)->selected = _bm_prev_selected; \ + } \ + (void)0 #endif /* __BMESH_MARKING_H__ */ |