Commit: 7740aa7338f46decca2b504846c9299cf3003fde Author: Campbell Barton Date: Tue Apr 16 10:13:09 2019 +0200 Branches: temp-clang-format https://developer.blender.org/rB7740aa7338f46decca2b504846c9299cf3003fde
Disable clang format (inline macro issue) =================================================================== M source/blender/draw/engines/eevee/eevee_private.h =================================================================== diff --git a/source/blender/draw/engines/eevee/eevee_private.h b/source/blender/draw/engines/eevee/eevee_private.h index 66e45430e18..5f073d45dfb 100644 --- a/source/blender/draw/engines/eevee/eevee_private.h +++ b/source/blender/draw/engines/eevee/eevee_private.h @@ -59,6 +59,8 @@ extern struct DrawEngineType draw_engine_eevee_type; # define SHADER_IRRADIANCE "#define IRRADIANCE_HL2\n" #endif +/* Macro causes over indentation. */ +/* clang-format off */ #define SHADER_DEFINES \ "#define EEVEE_ENGINE\n" \ "#define MAX_PROBE " STRINGIFY(MAX_PROBE) "\n" \ @@ -70,6 +72,7 @@ extern struct DrawEngineType draw_engine_eevee_type; "#define MAX_SHADOW_CASCADE " STRINGIFY(MAX_SHADOW_CASCADE) "\n" \ "#define MAX_CASCADE_NUM " STRINGIFY(MAX_CASCADE_NUM) "\n" \ SHADER_IRRADIANCE +/* clang-format on */ #define SWAP_DOUBLE_BUFFERS() { \ if (effects->swap_double_buffer) { \ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs