[Bf-blender-cvs] [f9c0d7261a2] master: Cleanup: clang-format

[Campbell Barton]

Commit: f9c0d7261a22d8d237e8cc23453c636c3a09c58b
Author: Campbell Barton
Date:   Sun Apr 11 14:37:37 2021 +1000
Branches: master
https://developer.blender.org/rBf9c0d7261a22d8d237e8cc23453c636c3a09c58b

Cleanup: clang-format

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

M	intern/cycles/render/scene.h
M	source/blender/draw/engines/eevee/eevee_volumes.c
M	source/blender/makesdna/DNA_mesh_types.h
M	source/blender/nodes/shader/nodes/node_shader_map_range.cc

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

diff --git a/intern/cycles/render/scene.h b/intern/cycles/render/scene.h
index 3e7de203c54..a6dab06f8f2 100644
--- a/intern/cycles/render/scene.h
+++ b/intern/cycles/render/scene.h
@@ -299,7 +299,7 @@ class Scene : public NodeOwner {
    * node array (e.g. Scene::geometry for Geometry nodes) and tag the appropriate
    * manager for an update.
    */
-  template<typename T, typename... Args> T *create_node(Args &&...args)
+  template<typename T, typename... Args> T *create_node(Args &&... args)
   {
     T *node = new T(args...);
     node->set_owner(this);
diff --git a/source/blender/draw/engines/eevee/eevee_volumes.c b/source/blender/draw/engines/eevee/eevee_volumes.c
index 2d84c87106c..d228d26cd52 100644
--- a/source/blender/draw/engines/eevee/eevee_volumes.c
+++ b/source/blender/draw/engines/eevee/eevee_volumes.c
@@ -394,9 +394,10 @@ static bool eevee_volume_object_grids_init(Object *ob, ListBase *gpu_grids, DRWS
      * - Grid exists and texture was loaded -> use texture.
      * - Grid exists but has zero size or failed to load -> use zero.
      * - Grid does not exist -> use default value. */
-    GPUTexture *grid_tex = (drw_grid)    ? drw_grid->texture :
-                           (volume_grid) ? e_data.dummy_zero :
-                                           eevee_volume_default_texture(gpu_grid->default_value);
+    GPUTexture *grid_tex = (drw_grid) ? drw_grid->texture :
+                                        (volume_grid) ?
+                                        e_data.dummy_zero :
+                                        eevee_volume_default_texture(gpu_grid->default_value);
 
     DRW_shgroup_uniform_texture(grp, gpu_grid->sampler_name, grid_tex);
 
diff --git a/source/blender/makesdna/DNA_mesh_types.h b/source/blender/makesdna/DNA_mesh_types.h
index 23323a36250..3eb5920dfe6 100644
--- a/source/blender/makesdna/DNA_mesh_types.h
+++ b/source/blender/makesdna/DNA_mesh_types.h
@@ -279,9 +279,9 @@ enum {
 /* We cant have both flags enabled at once,
  * flags defined in DNA_scene_types.h */
 #define ME_EDIT_PAINT_SEL_MODE(_me) \
-  (((_me)->editflag & ME_EDIT_PAINT_FACE_SEL) ? SCE_SELECT_FACE : \
-   ((_me)->editflag & ME_EDIT_PAINT_VERT_SEL) ? SCE_SELECT_VERTEX : \
-                                                0)
+  (((_me)->editflag & ME_EDIT_PAINT_FACE_SEL) ? \
+       SCE_SELECT_FACE : \
+       ((_me)->editflag & ME_EDIT_PAINT_VERT_SEL) ? SCE_SELECT_VERTEX : 0)
 
 /* me->flag */
 enum {
diff --git a/source/blender/nodes/shader/nodes/node_shader_map_range.cc b/source/blender/nodes/shader/nodes/node_shader_map_range.cc
index 789323d8a53..ad7abd9d491 100644
--- a/source/blender/nodes/shader/nodes/node_shader_map_range.cc
+++ b/source/blender/nodes/shader/nodes/node_shader_map_range.cc
@@ -90,8 +90,7 @@ static int gpu_shader_map_range(GPUMaterial *mat,
   return ret;
 }
 
-static void map_range_signature(
-    blender::fn::MFSignatureBuilder *signature, bool use_steps)
+static void map_range_signature(blender::fn::MFSignatureBuilder *signature, bool use_steps)
 {
   signature->single_input<float>("Value");
   signature->single_input<float>("From Min");