Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDalai Felinto <dalai@blender.org>2020-03-19 11:33:03 +0300
committerDalai Felinto <dalai@blender.org>2020-03-19 11:33:58 +0300
commit2d1cce8331f3ecdfb8cb0c651e111ffac5dc7153 (patch)
treeec50d7bdca3901a6afcc986943011f08f9516307 /source/blender/io/collada/DocumentImporter.cpp
parent008aaaa37841ca27d2bba80d8859336655cef455 (diff)
Cleanup: `make format` after SortedIncludes change
Diffstat (limited to 'source/blender/io/collada/DocumentImporter.cpp')
-rw-r--r--source/blender/io/collada/DocumentImporter.cpp28
1 files changed, 14 insertions, 14 deletions
diff --git a/source/blender/io/collada/DocumentImporter.cpp b/source/blender/io/collada/DocumentImporter.cpp
index 9b66ff429e1..281786bb45f 100644
--- a/source/blender/io/collada/DocumentImporter.cpp
+++ b/source/blender/io/collada/DocumentImporter.cpp
@@ -22,35 +22,35 @@
* * name imported objects
* * import object rotation as euler */
-#include <string>
-#include <map>
#include <algorithm> // sort()
+#include <map>
+#include <string>
-#include "COLLADAFWRoot.h"
-#include "COLLADAFWStableHeaders.h"
+#include "COLLADAFWArrayPrimitiveType.h"
+#include "COLLADAFWCamera.h"
#include "COLLADAFWColorOrTexture.h"
#include "COLLADAFWIndexList.h"
+#include "COLLADAFWLibraryNodes.h"
+#include "COLLADAFWLight.h"
#include "COLLADAFWMeshPrimitiveWithFaceVertexCount.h"
#include "COLLADAFWPolygons.h"
+#include "COLLADAFWRoot.h"
#include "COLLADAFWSampler.h"
+#include "COLLADAFWStableHeaders.h"
#include "COLLADAFWTypes.h"
#include "COLLADAFWVisualScene.h"
-#include "COLLADAFWArrayPrimitiveType.h"
-#include "COLLADAFWLibraryNodes.h"
-#include "COLLADAFWCamera.h"
-#include "COLLADAFWLight.h"
-#include "COLLADASaxFWLLoader.h"
#include "COLLADASaxFWLIExtraDataCallbackHandler.h"
+#include "COLLADASaxFWLLoader.h"
#include "MEM_guardedalloc.h"
extern "C" {
+#include "BLI_fileops.h"
#include "BLI_listbase.h"
#include "BLI_math.h"
#include "BLI_string.h"
#include "BLI_utildefines.h"
-#include "BLI_fileops.h"
#include "BKE_camera.h"
#include "BKE_collection.h"
@@ -58,8 +58,8 @@ extern "C" {
#include "BKE_global.h"
#include "BKE_image.h"
#include "BKE_layer.h"
-#include "BKE_light.h"
#include "BKE_lib_id.h"
+#include "BKE_light.h"
#include "BKE_material.h"
#include "BKE_scene.h"
@@ -77,14 +77,14 @@ extern "C" {
#include "DEG_depsgraph.h"
#include "DEG_depsgraph_build.h"
-#include "ExtraHandler.h"
-#include "ErrorHandler.h"
#include "DocumentImporter.h"
+#include "ErrorHandler.h"
+#include "ExtraHandler.h"
#include "TransformReader.h"
+#include "Materials.h"
#include "collada_internal.h"
#include "collada_utils.h"
-#include "Materials.h"
/*
* COLLADA Importer limitations: