ClangFormat: apply to source, most of intern

Apply clang format as proposed in T53211.

For details on usage and instructions for migrating branches
without conflicts, see:

https://wiki.blender.org/wiki/Tools/ClangFormat

1 files changed, 50 insertions, 49 deletions

diff --git a/source/blender/collada/MaterialExporter.h b/source/blender/collada/MaterialExporter.h
index debc226c099..d47a001596d 100644
--- a/source/blender/collada/MaterialExporter.h
+++ b/source/blender/collada/MaterialExporter.h
@@ -28,10 +28,10 @@
 #include "COLLADASWStreamWriter.h"
 
 extern "C" {
-	#include "BKE_material.h"
-	#include "DNA_material_types.h"
-	#include "DNA_object_types.h"
-	#include "DNA_scene_types.h"
+#include "BKE_material.h"
+#include "DNA_material_types.h"
+#include "DNA_object_types.h"
+#include "DNA_scene_types.h"
 }
 
 #include "GeometryExporter.h"
@@ -39,58 +39,59 @@ extern "C" {
 #include "ExportSettings.h"
 #include "Materials.h"
 
-class MaterialsExporter: COLLADASW::LibraryMaterials
-{
-public:
-	MaterialsExporter(COLLADASW::StreamWriter *sw, const ExportSettings *export_settings);
-	void exportMaterials(Scene *sce);
-	void operator()(Material *ma, Object *ob);
+class MaterialsExporter : COLLADASW::LibraryMaterials {
+ public:
+  MaterialsExporter(COLLADASW::StreamWriter *sw, const ExportSettings *export_settings);
+  void exportMaterials(Scene *sce);
+  void operator()(Material *ma, Object *ob);
 
-private:
-	bool hasMaterials(Scene *sce);
-	const ExportSettings *export_settings;
+ private:
+  bool hasMaterials(Scene *sce);
+  const ExportSettings *export_settings;
 };
 
 // used in forEachMaterialInScene
-template <class Functor>
-class ForEachMaterialFunctor
-{
-	std::vector<std::string> mMat; // contains list of material names, to avoid duplicate calling of f
-	Functor *f;
-public:
-	ForEachMaterialFunctor(Functor*f) : f(f) {}
-
-	void operator ()(Object *ob)
-	{
-		int a;
-		for (a = 0; a < ob->totcol; a++) {
-
-			Material *ma = give_current_material(ob, a+1);
-
-			if (!ma) continue;
-
-			std::string translated_id = translate_id(id_name(ma));
-			if (find(mMat.begin(), mMat.end(), translated_id) == mMat.end()) {
-				(*this->f)(ma, ob);
-
-				mMat.push_back(translated_id);
-			}
-		}
-	}
+template<class Functor> class ForEachMaterialFunctor {
+  std::vector<std::string>
+      mMat;  // contains list of material names, to avoid duplicate calling of f
+  Functor *f;
+
+ public:
+  ForEachMaterialFunctor(Functor *f) : f(f)
+  {
+  }
+
+  void operator()(Object *ob)
+  {
+    int a;
+    for (a = 0; a < ob->totcol; a++) {
+
+      Material *ma = give_current_material(ob, a + 1);
+
+      if (!ma)
+        continue;
+
+      std::string translated_id = translate_id(id_name(ma));
+      if (find(mMat.begin(), mMat.end(), translated_id) == mMat.end()) {
+        (*this->f)(ma, ob);
+
+        mMat.push_back(translated_id);
+      }
+    }
+  }
 };
 
 struct MaterialFunctor {
-	// calls f for each unique material linked to each object in sce
-	// f should have
-	// void operator()(Material *ma)
-	template<class Functor>
-	void forEachMaterialInExportSet(Scene *sce, Functor &f, LinkNode *export_set)
-	{
-		ForEachMaterialFunctor<Functor> matfunc(&f);
-		GeometryFunctor gf;
-		gf.forEachMeshObjectInExportSet<ForEachMaterialFunctor<Functor> >(sce, matfunc, export_set);
-	}
+  // calls f for each unique material linked to each object in sce
+  // f should have
+  // void operator()(Material *ma)
+  template<class Functor>
+  void forEachMaterialInExportSet(Scene *sce, Functor &f, LinkNode *export_set)
+  {
+    ForEachMaterialFunctor<Functor> matfunc(&f);
+    GeometryFunctor gf;
+    gf.forEachMeshObjectInExportSet<ForEachMaterialFunctor<Functor>>(sce, matfunc, export_set);
+  }
 };
 
-
 #endif