Cleanup: preprocessor indentation
authorCampbell Barton <ideasman42@gmail.com>
Thu, 3 Jan 2019 04:52:07 +0000 (15:52 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 3 Jan 2019 04:52:07 +0000 (15:52 +1100)
13 files changed:
source/blender/blenkernel/intern/mesh_validate.c
source/blender/blenkernel/intern/smoke.c
source/blender/blenlib/BLI_sys_types.h
source/blender/draw/engines/eevee/shaders/effect_gtao_frag.glsl
source/blender/draw/intern/draw_manager_exec.c
source/blender/freestyle/intern/geometry/GeomCleaner.cpp
source/blender/freestyle/intern/stroke/TextStrokeRenderer.cpp
source/blender/freestyle/intern/stroke/TextStrokeRenderer.h
source/blender/imbuf/intern/anim_movie.c
source/blender/imbuf/intern/jp2.c
source/blender/modifiers/intern/MOD_meshsequencecache.c
source/blender/python/intern/bpy_app_handlers.c
source/blender/windowmanager/intern/wm_event_system.c

index f0115967d8474e24d23f8a721ac4e72b2a416f15..421ecf264ee8b2c14908c09804f4b3fba17f9af5 100644 (file)
@@ -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;
index 7474df7bec63a699e740737716fcf567d40edb99..5f9015ae2ce7acd7eea4996758bf13e4394f16e2 100644 (file)
@@ -98,7 +98,7 @@
 //#define DEBUG_TIME
 
 #ifdef DEBUG_TIME
-#      include "PIL_time.h"
+#  include "PIL_time.h"
 #endif
 
 #include "smoke_API.h"
index ccafa1cf32788b144721b24e8375ee07a1069d8e..d9f99b2f0670830eec82a0218efa57161623bcd6 100644 (file)
@@ -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;
index ccef05ef9851425235f54606ff9b9d1b0ce00720..d12b5232968815bfa49795918bcb3250b404b4c2 100644 (file)
@@ -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
 
index 73859423eb9a88c77e2317324b2dad78559b562f..a428fde6f00cf0f20d7dfe3859262cf152040c5e 100644 (file)
@@ -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;                                    \
        }
 
index c5d1c8df17be5420efeaae62f041a319d70ca081..c5db92d8f7539c1f6e8cf6af26a7053eefb40192 100644 (file)
@@ -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
 
index ecfb4d4fa258ac16eba8c73f90784ba9e60a219d..e2c0de213c63ec1c897284cb7c019436869427f3 100644 (file)
@@ -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 {
 
index dd0b945e4d3773695e48ed7958255abc94a20930..eba3421675c2845cf5a30f3608711595d081ecea 100644 (file)
@@ -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 {
 
index 89ae32ee2b3c56ff5f243bb8ec673865fd34966f..7f33a95953b1a498c94973c9d98b63508d3f01cd 100644 (file)
@@ -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)
index caf2634bac7c0e2b0a91a42537001533ea3564cb..de74a3215045d596cce0f424da0911199748cb69 100644 (file)
@@ -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 \
 
index 771ccd31e2276b71602c9914c22d9194a27cc6f7..f0cdd2b2899e8e72fa47f5fd241f0bfa6933f6cb 100644 (file)
@@ -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)
index a251bdeb15b23451a2819b79cda59aa7f3a898b0..d89b3bd01f5ce791f5d2f264acfdc6a54b6ee5fc 100644 (file)
@@ -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}
index 81544c2de62c82581802f51e6ba1277d092861e2..c4d537cace94efd82e206839741d3628c2e79b83 100644 (file)
@@ -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;