[Bf-blender-cvs] [9200dc0eb14] master: Cleanup: preprocessor indentation
Campbell Barton
noreply at git.blender.org
Thu Jan 3 06:02:57 CET 2019
Commit: 9200dc0eb149260d52f34333b74459ed0e389a80
Author: Campbell Barton
Date: Thu Jan 3 15:52:07 2019 +1100
Branches: master
https://developer.blender.org/rB9200dc0eb149260d52f34333b74459ed0e389a80
Cleanup: preprocessor indentation
===================================================================
M source/blender/blenkernel/intern/mesh_validate.c
M source/blender/blenkernel/intern/smoke.c
M source/blender/blenlib/BLI_sys_types.h
M source/blender/draw/engines/eevee/shaders/effect_gtao_frag.glsl
M source/blender/draw/intern/draw_manager_exec.c
M source/blender/freestyle/intern/geometry/GeomCleaner.cpp
M source/blender/freestyle/intern/stroke/TextStrokeRenderer.cpp
M source/blender/freestyle/intern/stroke/TextStrokeRenderer.h
M source/blender/imbuf/intern/anim_movie.c
M source/blender/imbuf/intern/jp2.c
M source/blender/modifiers/intern/MOD_meshsequencecache.c
M source/blender/python/intern/bpy_app_handlers.c
M source/blender/windowmanager/intern/wm_event_system.c
===================================================================
diff --git a/source/blender/blenkernel/intern/mesh_validate.c b/source/blender/blenkernel/intern/mesh_validate.c
index f0115967d84..421ecf264ee 100644
--- a/source/blender/blenkernel/intern/mesh_validate.c
+++ b/source/blender/blenkernel/intern/mesh_validate.c
@@ -223,11 +223,11 @@ bool BKE_mesh_validate_arrays(
const bool do_verbose, const bool do_fixes,
bool *r_changed)
{
-# define REMOVE_EDGE_TAG(_me) { _me->v2 = _me->v1; free_flag.edges = do_fixes; } (void)0
-# define IS_REMOVED_EDGE(_me) (_me->v2 == _me->v1)
+#define REMOVE_EDGE_TAG(_me) { _me->v2 = _me->v1; free_flag.edges = do_fixes; } (void)0
+#define IS_REMOVED_EDGE(_me) (_me->v2 == _me->v1)
-# define REMOVE_LOOP_TAG(_ml) { _ml->e = INVALID_LOOP_EDGE_MARKER; free_flag.polyloops = do_fixes; } (void)0
-# define REMOVE_POLY_TAG(_mp) { _mp->totloop *= -1; free_flag.polyloops = do_fixes; } (void)0
+#define REMOVE_LOOP_TAG(_ml) { _ml->e = INVALID_LOOP_EDGE_MARKER; free_flag.polyloops = do_fixes; } (void)0
+#define REMOVE_POLY_TAG(_mp) { _mp->totloop *= -1; free_flag.polyloops = do_fixes; } (void)0
MVert *mv = mverts;
MEdge *me;
diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c
index 7474df7bec6..5f9015ae2ce 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -98,7 +98,7 @@
//#define DEBUG_TIME
#ifdef DEBUG_TIME
-# include "PIL_time.h"
+# include "PIL_time.h"
#endif
#include "smoke_API.h"
diff --git a/source/blender/blenlib/BLI_sys_types.h b/source/blender/blenlib/BLI_sys_types.h
index ccafa1cf327..d9f99b2f067 100644
--- a/source/blender/blenlib/BLI_sys_types.h
+++ b/source/blender/blenlib/BLI_sys_types.h
@@ -56,7 +56,7 @@ extern "C" {
/* XXX */
#ifndef UINT64_MAX
-# define UINT64_MAX 18446744073709551615
+# define UINT64_MAX 18446744073709551615
typedef uint8_t u_int8_t;
typedef uint16_t u_int16_t;
typedef uint32_t u_int32_t;
diff --git a/source/blender/draw/engines/eevee/shaders/effect_gtao_frag.glsl b/source/blender/draw/engines/eevee/shaders/effect_gtao_frag.glsl
index ccef05ef985..d12b5232968 100644
--- a/source/blender/draw/engines/eevee/shaders/effect_gtao_frag.glsl
+++ b/source/blender/draw/engines/eevee/shaders/effect_gtao_frag.glsl
@@ -37,12 +37,12 @@ void main()
#ifdef LAYERED_DEPTH
uniform sampler2DArray depthBufferLayered;
uniform int layer;
-# define gtao_depthBuffer depthBufferLayered
-# define gtao_textureLod(a, b, c) textureLod(a, vec3(b, layer), c)
+# define gtao_depthBuffer depthBufferLayered
+# define gtao_textureLod(a, b, c) textureLod(a, vec3(b, layer), c)
#else
-# define gtao_depthBuffer depthBuffer
-# define gtao_textureLod(a, b, c) textureLod(a, b, c)
+# define gtao_depthBuffer depthBuffer
+# define gtao_textureLod(a, b, c) textureLod(a, b, c)
#endif
diff --git a/source/blender/draw/intern/draw_manager_exec.c b/source/blender/draw/intern/draw_manager_exec.c
index 73859423eb9..a428fde6f00 100644
--- a/source/blender/draw/intern/draw_manager_exec.c
+++ b/source/blender/draw/intern/draw_manager_exec.c
@@ -1146,7 +1146,7 @@ static void draw_shgroup(DRWShadingGroup *shgroup, DRWState pass_state)
GPU_select_load_id(select_id[_start]); \
}
-# define GPU_SELECT_LOAD_IF_PICKSEL_LIST_END(_start, _count) \
+# define GPU_SELECT_LOAD_IF_PICKSEL_LIST_END(_start, _count) \
_start += _count; \
}
diff --git a/source/blender/freestyle/intern/geometry/GeomCleaner.cpp b/source/blender/freestyle/intern/geometry/GeomCleaner.cpp
index c5d1c8df17b..c5db92d8f75 100644
--- a/source/blender/freestyle/intern/geometry/GeomCleaner.cpp
+++ b/source/blender/freestyle/intern/geometry/GeomCleaner.cpp
@@ -29,9 +29,9 @@
#if defined(__GNUC__) && (__GNUC__ >= 3)
// hash_map is not part of the C++ standard anymore;
// hash_map.h has been kept though for backward compatibility
-# include <hash_map.h>
+# include <hash_map.h>
#else
-# include <hash_map>
+# include <hash_map>
#endif
#endif
diff --git a/source/blender/freestyle/intern/stroke/TextStrokeRenderer.cpp b/source/blender/freestyle/intern/stroke/TextStrokeRenderer.cpp
index ecfb4d4fa25..e2c0de213c6 100644
--- a/source/blender/freestyle/intern/stroke/TextStrokeRenderer.cpp
+++ b/source/blender/freestyle/intern/stroke/TextStrokeRenderer.cpp
@@ -18,9 +18,9 @@
* ***** END GPL LICENSE BLOCK *****
*/
-# include "TextStrokeRenderer.h"
-# include "Canvas.h"
-# include "StrokeIterators.h"
+#include "TextStrokeRenderer.h"
+#include "Canvas.h"
+#include "StrokeIterators.h"
namespace Freestyle {
diff --git a/source/blender/freestyle/intern/stroke/TextStrokeRenderer.h b/source/blender/freestyle/intern/stroke/TextStrokeRenderer.h
index dd0b945e4d3..eba3421675c 100644
--- a/source/blender/freestyle/intern/stroke/TextStrokeRenderer.h
+++ b/source/blender/freestyle/intern/stroke/TextStrokeRenderer.h
@@ -38,9 +38,9 @@
#ifndef TEXTSTROKERENDERER_H
#define TEXTSTROKERENDERER_H
-# include "StrokeRenderer.h"
-# include "../system/FreestyleConfig.h"
-# include <fstream>
+#include "StrokeRenderer.h"
+#include "../system/FreestyleConfig.h"
+#include <fstream>
namespace Freestyle {
diff --git a/source/blender/imbuf/intern/anim_movie.c b/source/blender/imbuf/intern/anim_movie.c
index 89ae32ee2b3..7f33a95953b 100644
--- a/source/blender/imbuf/intern/anim_movie.c
+++ b/source/blender/imbuf/intern/anim_movie.c
@@ -114,9 +114,9 @@ static void free_anim_movie(struct anim *UNUSED(anim))
#if defined(_WIN32)
-# define PATHSEPARATOR '\\'
+# define PATHSEPARATOR '\\'
#else
-# define PATHSEPARATOR '/'
+# define PATHSEPARATOR '/'
#endif
static int an_stringdec(const char *string, char *head, char *tail, unsigned short *numlen)
diff --git a/source/blender/imbuf/intern/jp2.c b/source/blender/imbuf/intern/jp2.c
index caf2634bac7..de74a321504 100644
--- a/source/blender/imbuf/intern/jp2.c
+++ b/source/blender/imbuf/intern/jp2.c
@@ -119,21 +119,21 @@ static void info_callback(const char *msg, void *client_data)
}
#endif
-# define PIXEL_LOOPER_BEGIN(_rect) \
+#define PIXEL_LOOPER_BEGIN(_rect) \
for (y = h - 1; y != (unsigned int)(-1); y--) { \
for (i = y * w, i_next = (y + 1) * w; \
i < i_next; \
i++, _rect += 4) \
{ \
-# define PIXEL_LOOPER_BEGIN_CHANNELS(_rect, _channels) \
+#define PIXEL_LOOPER_BEGIN_CHANNELS(_rect, _channels) \
for (y = h - 1; y != (unsigned int)(-1); y--) { \
for (i = y * w, i_next = (y + 1) * w; \
i < i_next; \
i++, _rect += _channels) \
{ \
-# define PIXEL_LOOPER_END \
+#define PIXEL_LOOPER_END \
} \
} (void)0 \
diff --git a/source/blender/modifiers/intern/MOD_meshsequencecache.c b/source/blender/modifiers/intern/MOD_meshsequencecache.c
index 771ccd31e22..f0cdd2b2899 100644
--- a/source/blender/modifiers/intern/MOD_meshsequencecache.c
+++ b/source/blender/modifiers/intern/MOD_meshsequencecache.c
@@ -42,8 +42,8 @@
#include "MOD_modifiertypes.h"
#ifdef WITH_ALEMBIC
-# include "ABC_alembic.h"
-# include "BKE_global.h"
+# include "ABC_alembic.h"
+# include "BKE_global.h"
#endif
static void initData(ModifierData *md)
diff --git a/source/blender/python/intern/bpy_app_handlers.c b/source/blender/python/intern/bpy_app_handlers.c
index a251bdeb15b..d89b3bd01f5 100644
--- a/source/blender/python/intern/bpy_app_handlers.c
+++ b/source/blender/python/intern/bpy_app_handlers.c
@@ -69,7 +69,7 @@ static PyStructSequence_Field app_cb_info_fields[] = {
{(char *)"load_factory_startup_post", (char *)"on loading factory startup (after)"},
/* sets the permanent tag */
-# define APP_CB_OTHER_FIELDS 1
+#define APP_CB_OTHER_FIELDS 1
{(char *)"persistent", (char *)"Function decorator for callback functions not to be removed when loading new files"},
{NULL}
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c
index 81544c2de62..c4d537cace9 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -2292,7 +2292,7 @@ static int wm_handlers_do_intern(bContext *C, wmEvent *event, ListBase *handlers
/* comment this out to flood the console! (if you really want to test) */
!ELEM(event->type, MOUSEMOVE, INBETWEEN_MOUSEMOVE)
;
-# define PRINT if (do_debug_handler) printf
+#define PRINT if (do_debug_handler) printf
wmWindowManager *wm = CTX_wm_manager(C);
wmEventHandler *handler, *nexthandler;
More information about the Bf-blender-cvs
mailing list