Cleanup: make format

intern/cycles/render/hair.cpp

@@ -16,8 +16,8 @@
 
 #include "bvh/bvh.h"
 
-#include "render/hair.h"
 #include "render/curves.h"
+#include "render/hair.h"
 #include "render/scene.h"
 
 CCL_NAMESPACE_BEGIN

intern/ghost/intern/GHOST_SystemPathsUnix.cpp

@@ -153,7 +153,7 @@ const GHOST_TUns8 *GHOST_SystemPathsUnix::getUserSpecialDir(GHOST_TUserSpecialDi
     char c = fgetc(fstream);
     /* xdg-user-dir ends the path with '\n'. */
     if (c == '\n') {
-        break;
+      break;
     }
     path_stream << c;
   }

intern/ghost/intern/GHOST_SystemWin32.cpp

@@ -2093,9 +2093,10 @@ GHOST_TSuccess GHOST_SystemWin32::showMessageBox(const char *title,
   config.cbSize = sizeof(config);
   config.hInstance = 0;
   config.dwCommonButtons = 0;
-  config.pszMainIcon = (dialog_options & GHOST_DialogError   ? TD_ERROR_ICON :
+  config.pszMainIcon = (dialog_options & GHOST_DialogError ?
-                        dialog_options & GHOST_DialogWarning ? TD_WARNING_ICON :
+                            TD_ERROR_ICON :
-                                                               TD_INFORMATION_ICON);
+                            dialog_options & GHOST_DialogWarning ? TD_WARNING_ICON :
+                                                                   TD_INFORMATION_ICON);
   config.pszWindowTitle = L"Blender";
   config.pszMainInstruction = title_16;
   config.pszContent = message_16;

source/blender/blenkernel/BKE_layer.h

@@ -28,9 +28,9 @@
 extern "C" {
 #endif
 
-#define TODO_LAYER_OVERRIDE /* CollectionOverride */
+#define TODO_LAYER_OVERRIDE  /* CollectionOverride */
 #define TODO_LAYER_OPERATORS /* collection mamanger and property panel operators */
-#define TODO_LAYER /* generic todo */
+#define TODO_LAYER           /* generic todo */
 
 struct Base;
 struct BlendDataReader;

source/blender/blenkernel/intern/softbody.c

@@ -150,7 +150,7 @@ typedef struct SB_thread_context {
 #define BSF_INTERSECT 1 /* edge intersects collider face */
 
 /* private definitions for bodypoint states */
-#define SBF_DOFUZZY 1 /* Bodypoint do fuzzy */
+#define SBF_DOFUZZY 1        /* Bodypoint do fuzzy */
 #define SBF_OUTOFCOLLISION 2 /* Bodypoint does not collide  */
 
 #define BFF_INTERSECT 1 /* collider edge   intrudes face */

source/blender/makesdna/DNA_node_types.h

@@ -351,8 +351,8 @@ typedef struct bNode {
 /* XXX NODE_UPDATE is a generic update flag. More fine-grained updates
  * might be used in the future, but currently all work the same way.
  */
-#define NODE_UPDATE 0xFFFF /* generic update flag (includes all others) */
+#define NODE_UPDATE 0xFFFF     /* generic update flag (includes all others) */
-#define NODE_UPDATE_ID 1 /* associated id data block has changed */
+#define NODE_UPDATE_ID 1       /* associated id data block has changed */
 #define NODE_UPDATE_OPERATOR 2 /* node update triggered from update operator */
 
 /* Unique hash key for identifying node instances
@@ -511,11 +511,11 @@ typedef struct bNodeTree {
 #define NTREE_TYPE_INIT 1
 
 /* ntree->flag */
-#define NTREE_DS_EXPAND (1 << 0) /* for animation editors */
+#define NTREE_DS_EXPAND (1 << 0)            /* for animation editors */
-#define NTREE_COM_OPENCL (1 << 1) /* use opencl */
+#define NTREE_COM_OPENCL (1 << 1)           /* use opencl */
-#define NTREE_TWO_PASS (1 << 2) /* two pass */
+#define NTREE_TWO_PASS (1 << 2)             /* two pass */
 #define NTREE_COM_GROUPNODE_BUFFER (1 << 3) /* use groupnode buffers */
-#define NTREE_VIEWER_BORDER (1 << 4) /* use a border for viewer nodes */
+#define NTREE_VIEWER_BORDER (1 << 4)        /* use a border for viewer nodes */
 /* NOTE: DEPRECATED, use (id->tag & LIB_TAG_LOCALIZED) instead. */
 
 /* tree is localized copy, free when deleting node groups */
@@ -1096,7 +1096,7 @@ typedef struct NodeAttributeMix {
 #define NODE_IES_EXTERNAL 1
 
 /* frame node flags */
-#define NODE_FRAME_SHRINK 1 /* keep the bounding box minimal */
+#define NODE_FRAME_SHRINK 1     /* keep the bounding box minimal */
 #define NODE_FRAME_RESIZEABLE 2 /* test flag, if frame can be resized by user */
 
 /* proxy node flags */

source/blender/makesdna/DNA_scene_types.h

@@ -482,7 +482,7 @@ typedef struct ImageFormatData {
 #define R_IMF_IMTYPE_INVALID 255
 
 /* ImageFormatData.flag */
-#define R_IMF_FLAG_ZBUF (1 << 0) /* was R_OPENEXR_ZBUF */
+#define R_IMF_FLAG_ZBUF (1 << 0)        /* was R_OPENEXR_ZBUF */
 #define R_IMF_FLAG_PREVIEW_JPG (1 << 1) /* was R_PREVIEW_JPG */
 
 /* return values from BKE_imtype_valid_depths, note this is depts per channel */
@@ -524,8 +524,8 @@ typedef enum eImageFormatDepth {
 
 /* ImageFormatData.jp2_flag */
 #define R_IMF_JP2_FLAG_YCC (1 << 0) /* when disabled use RGB */ /* was R_JPEG2K_YCC */
-#define R_IMF_JP2_FLAG_CINE_PRESET (1 << 1) /* was R_JPEG2K_CINE_PRESET */
+#define R_IMF_JP2_FLAG_CINE_PRESET (1 << 1)                     /* was R_JPEG2K_CINE_PRESET */
-#define R_IMF_JP2_FLAG_CINE_48 (1 << 2) /* was R_JPEG2K_CINE_48FPS */
+#define R_IMF_JP2_FLAG_CINE_48 (1 << 2)                         /* was R_JPEG2K_CINE_48FPS */
 
 /* ImageFormatData.jp2_codec */
 #define R_IMF_JP2_CODEC_JP2 0
@@ -1824,12 +1824,12 @@ typedef struct Scene {
 
 #define R_MODE_UNUSED_20 (1 << 20) /* cleared */
 #define R_MODE_UNUSED_21 (1 << 21) /* cleared */
-#define R_NO_OVERWRITE (1 << 22) /* skip existing files */
+#define R_NO_OVERWRITE (1 << 22)   /* skip existing files */
-#define R_TOUCH (1 << 23) /* touch files before rendering */
+#define R_TOUCH (1 << 23)          /* touch files before rendering */
 #define R_SIMPLIFY (1 << 24)
-#define R_EDGE_FRS (1 << 25) /* R_EDGE reserved for Freestyle */
+#define R_EDGE_FRS (1 << 25)        /* R_EDGE reserved for Freestyle */
 #define R_PERSISTENT_DATA (1 << 26) /* keep data around for re-render */
-#define R_MODE_UNUSED_27 (1 << 27) /* cleared */
+#define R_MODE_UNUSED_27 (1 << 27)  /* cleared */
 
 /** #RenderData.seq_flag */
 enum {