summaryrefslogtreecommitdiffstats
path: root/modules/csg/csg.h
diff options
context:
space:
mode:
authorreduz <reduzio@gmail.com>2020-11-07 19:33:38 -0300
committerreduz <reduzio@gmail.com>2020-11-07 20:17:12 -0300
commit127458ed175c5aeac8dee7f09d23fae4c8928eb7 (patch)
treea1dd3ae46bf575cb8296df38568dfce237c6ecd8 /modules/csg/csg.h
parent30b6db99a99a94c64d906c1b828ff44f79a1bc75 (diff)
downloadredot-engine-127458ed175c5aeac8dee7f09d23fae4c8928eb7.tar.gz
Reorganized core/ directory, it was too fatty already
-Removed FuncRef, since Callable makes it obsolete -Removed int_types.h as its obsolete in c++11+ -Changed color names code
Diffstat (limited to 'modules/csg/csg.h')
-rw-r--r--modules/csg/csg.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/modules/csg/csg.h b/modules/csg/csg.h
index 34ee239c17..ef1103e1ac 100644
--- a/modules/csg/csg.h
+++ b/modules/csg/csg.h
@@ -31,16 +31,16 @@
#ifndef CSG_H
#define CSG_H
-#include "core/list.h"
-#include "core/map.h"
#include "core/math/aabb.h"
#include "core/math/plane.h"
#include "core/math/transform.h"
#include "core/math/vector2.h"
#include "core/math/vector3.h"
-#include "core/oa_hash_map.h"
-#include "core/reference.h"
-#include "core/vector.h"
+#include "core/object/reference.h"
+#include "core/templates/list.h"
+#include "core/templates/map.h"
+#include "core/templates/oa_hash_map.h"
+#include "core/templates/vector.h"
#include "scene/resources/material.h"
struct CSGBrush {