[Bf-blender-cvs] [e8ed78c8849] master: ClangFormat: remove FAKE_SELECT_MODE_BEGIN from ForEachMacros
Campbell Barton
noreply at git.blender.org
Thu May 16 01:40:46 CEST 2019
Commit: e8ed78c884992b3f7cbc6a8443f0b742dd759c5c
Author: Campbell Barton
Date: Thu May 16 09:40:15 2019 +1000
Branches: master
https://developer.blender.org/rBe8ed78c884992b3f7cbc6a8443f0b742dd759c5c
ClangFormat: remove FAKE_SELECT_MODE_BEGIN from ForEachMacros
This isn't used for looping.
===================================================================
M .clang-format
M source/blender/editors/mesh/editmesh_select.c
M source/blender/editors/space_file/fsmenu.c
===================================================================
diff --git a/.clang-format b/.clang-format
index c876affd8b8..36c5643a52b 100644
--- a/.clang-format
+++ b/.clang-format
@@ -183,7 +183,6 @@ ForEachMacros:
- DEG_OBJECT_ITER_FOR_RENDER_ENGINE_BEGIN
- DRIVER_TARGETS_LOOPER_BEGIN
- DRIVER_TARGETS_USED_LOOPER_BEGIN
- - FAKE_SELECT_MODE_BEGIN
- FOREACH_BASE_IN_EDIT_MODE_BEGIN
- FOREACH_BASE_IN_MODE_BEGIN
- FOREACH_BEGIN
diff --git a/source/blender/editors/mesh/editmesh_select.c b/source/blender/editors/mesh/editmesh_select.c
index 28551280ff4..5344537e2d1 100644
--- a/source/blender/editors/mesh/editmesh_select.c
+++ b/source/blender/editors/mesh/editmesh_select.c
@@ -570,8 +570,7 @@ BMVert *EDBM_vert_find_nearest_ex(ViewContext *vc,
/* No afterqueue (yet), so we check it now, otherwise the bm_xxxofs indices are bad. */
{
- FAKE_SELECT_MODE_BEGIN (vc, fake_select_mode, select_mode, SCE_SELECT_VERTEX)
- ;
+ FAKE_SELECT_MODE_BEGIN(vc, fake_select_mode, select_mode, SCE_SELECT_VERTEX);
edbm_select_pick_cache_alloc(bases_len);
edbm_select_pick_draw_bases(vc, bases, bases_len, select_mode);
@@ -790,8 +789,7 @@ BMEdge *EDBM_edge_find_nearest_ex(ViewContext *vc,
/* No afterqueue (yet), so we check it now, otherwise the bm_xxxofs indices are bad. */
{
- FAKE_SELECT_MODE_BEGIN (vc, fake_select_mode, select_mode, SCE_SELECT_EDGE)
- ;
+ FAKE_SELECT_MODE_BEGIN(vc, fake_select_mode, select_mode, SCE_SELECT_EDGE);
edbm_select_pick_cache_alloc(bases_len);
edbm_select_pick_draw_bases(vc, bases, bases_len, select_mode);
@@ -994,8 +992,7 @@ BMFace *EDBM_face_find_nearest_ex(ViewContext *vc,
BMFace *efa;
{
- FAKE_SELECT_MODE_BEGIN (vc, fake_select_mode, select_mode, SCE_SELECT_FACE)
- ;
+ FAKE_SELECT_MODE_BEGIN(vc, fake_select_mode, select_mode, SCE_SELECT_FACE);
edbm_select_pick_cache_alloc(bases_len);
edbm_select_pick_draw_bases(vc, bases, bases_len, select_mode);
diff --git a/source/blender/editors/space_file/fsmenu.c b/source/blender/editors/space_file/fsmenu.c
index 208ba73b8a6..b50c37baae6 100644
--- a/source/blender/editors/space_file/fsmenu.c
+++ b/source/blender/editors/space_file/fsmenu.c
@@ -47,7 +47,6 @@
#include "WM_api.h"
#include "WM_types.h"
-
#ifdef __APPLE__
# include <Carbon/Carbon.h>
#endif /* __APPLE__ */
More information about the Bf-blender-cvs
mailing list