[Bf-blender-cvs] [bce98ce6a09] temp-clang-format: clang-format: disable for DefNode

Campbell Barton noreply at git.blender.org
Fri Apr 12 12:55:35 CEST 2019


Commit: bce98ce6a09867730ba2b0076423e913da87b0b3
Author: Campbell Barton
Date:   Fri Apr 12 20:50:08 2019 +1000
Branches: temp-clang-format
https://developer.blender.org/rBbce98ce6a09867730ba2b0076423e913da87b0b3

clang-format: disable for DefNode

This doesn't format properly and gives different results on second
execution.

===================================================================

M	source/blender/nodes/NOD_static_types.h

===================================================================

diff --git a/source/blender/nodes/NOD_static_types.h b/source/blender/nodes/NOD_static_types.h
index 1c3b792f20b..2841219b1ee 100644
--- a/source/blender/nodes/NOD_static_types.h
+++ b/source/blender/nodes/NOD_static_types.h
@@ -20,6 +20,8 @@
 
 /* intentionally no include guard */
 
+/* clang-format off */
+
 /* Empty definitions for undefined macros to avoid warnings */
 #ifndef DefNode
 #define DefNode(Category, ID, DefFunc, EnumName, StructName, UIName, UIDesc)
@@ -249,3 +251,5 @@ DefNode(TextureNode,    TEX_NODE_PROC+TEX_DISTNOISE, 0,                  "TEX_DI
 
 /* undefine macros */
 #undef DefNode
+
+/* clang-format on */



More information about the Bf-blender-cvs mailing list