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 /intern/dualcon
parent008aaaa37841ca27d2bba80d8859336655cef455 (diff)
Cleanup: `make format` after SortedIncludes change
Diffstat (limited to 'intern/dualcon')
-rw-r--r--intern/dualcon/intern/Projections.cpp2
-rw-r--r--intern/dualcon/intern/dualcon_c_api.cpp4
-rw-r--r--intern/dualcon/intern/octree.h16
3 files changed, 11 insertions, 11 deletions
diff --git a/intern/dualcon/intern/Projections.cpp b/intern/dualcon/intern/Projections.cpp
index b065ba95330..3bf7f8f1de2 100644
--- a/intern/dualcon/intern/Projections.cpp
+++ b/intern/dualcon/intern/Projections.cpp
@@ -18,8 +18,8 @@
# include "MEM_guardedalloc.h"
#endif
-#include <math.h>
#include "Projections.h"
+#include <math.h>
const int vertmap[8][3] = {
{0, 0, 0},
diff --git a/intern/dualcon/intern/dualcon_c_api.cpp b/intern/dualcon/intern/dualcon_c_api.cpp
index 459bb711e13..d6d9dc4e76f 100644
--- a/intern/dualcon/intern/dualcon_c_api.cpp
+++ b/intern/dualcon/intern/dualcon_c_api.cpp
@@ -14,10 +14,10 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <cassert>
-#include "dualcon.h"
#include "ModelReader.h"
+#include "dualcon.h"
#include "octree.h"
+#include <cassert>
#include <cstdio>
#include <float.h>
diff --git a/intern/dualcon/intern/octree.h b/intern/dualcon/intern/octree.h
index b2d88f0d2b5..004897950b3 100644
--- a/intern/dualcon/intern/octree.h
+++ b/intern/dualcon/intern/octree.h
@@ -17,18 +17,18 @@
#ifndef __OCTREE_H__
#define __OCTREE_H__
-#include <cassert>
-#include <cstring>
-#include <stdio.h>
-#include <math.h>
#include "GeoCommon.h"
-#include "Projections.h"
-#include "ModelReader.h"
#include "MemoryAllocator.h"
-#include "cubes.h"
+#include "ModelReader.h"
+#include "Projections.h"
#include "Queue.h"
-#include "manifold_table.h"
+#include "cubes.h"
#include "dualcon.h"
+#include "manifold_table.h"
+#include <cassert>
+#include <cstring>
+#include <math.h>
+#include <stdio.h>
/**
* Main class and structures for scan-convertion, sign-generation,