[Bf-blender-cvs] [9e60e860577] master: Cleanup: clang-format

[Campbell Barton]

Commit: 9e60e860577f536841a8865cb5328b98895644e3
Author: Campbell Barton
Date:   Fri Sep 13 21:11:41 2019 +1000
Branches: master
https://developer.blender.org/rB9e60e860577f536841a8865cb5328b98895644e3

Cleanup: clang-format

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

M	intern/cycles/kernel/shaders/node_vertex_color.osl
M	intern/cycles/render/film.h
M	intern/ghost/intern/GHOST_NDOFManagerCocoa.mm
M	source/blender/blenkernel/BKE_action.h

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

diff --git a/intern/cycles/kernel/shaders/node_vertex_color.osl b/intern/cycles/kernel/shaders/node_vertex_color.osl
index 1997a690181..16bf3dd146e 100644
--- a/intern/cycles/kernel/shaders/node_vertex_color.osl
+++ b/intern/cycles/kernel/shaders/node_vertex_color.osl
@@ -34,7 +34,8 @@ shader node_vertex_color(string bump_offset = "center",
       Color += Dy(Color);
       Alpha += Dy(Alpha);
     }
-  } else {
+  }
+  else {
     warning("%s", "Invalid attribute.");
   }
 }
diff --git a/intern/cycles/render/film.h b/intern/cycles/render/film.h
index 20f6261a871..2c4e07d60ae 100644
--- a/intern/cycles/render/film.h
+++ b/intern/cycles/render/film.h
@@ -91,7 +91,7 @@ class Film : public Node {
   void device_free(Device *device, DeviceScene *dscene, Scene *scene);
 
   bool modified(const Film &film);
-  void tag_passes_update(Scene *scene, const vector<Pass> &passes_, bool update_passes=true);
+  void tag_passes_update(Scene *scene, const vector<Pass> &passes_, bool update_passes = true);
   void tag_update(Scene *scene);
 };
 
diff --git a/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm b/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm
index b4ee8308d73..4c9c58c36be 100644
--- a/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm
+++ b/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm
@@ -121,7 +121,8 @@ static bool load_driver_functions()
     return true;
   }
 
-  module = dlopen("/Library/Frameworks/3DconnexionClient.framework/3DconnexionClient", RTLD_LAZY | RTLD_LOCAL);
+  module = dlopen("/Library/Frameworks/3DconnexionClient.framework/3DconnexionClient",
+                  RTLD_LAZY | RTLD_LOCAL);
 
   if (module) {
     LOAD_FUNC(SetConnexionHandlers);
diff --git a/source/blender/blenkernel/BKE_action.h b/source/blender/blenkernel/BKE_action.h
index a4863780d2e..868c5a69593 100644
--- a/source/blender/blenkernel/BKE_action.h
+++ b/source/blender/blenkernel/BKE_action.h
@@ -19,6 +19,7 @@
 
 #ifndef __BKE_ACTION_H__
 #define __BKE_ACTION_H__
+
 /** \file
  * \ingroup bke
  * \brief Blender kernel action and pose functionality.