diff options
| author | reduz <reduzio@gmail.com> | 2020-11-07 19:33:38 -0300 |
|---|---|---|
| committer | reduz <reduzio@gmail.com> | 2020-11-07 20:17:12 -0300 |
| commit | 127458ed175c5aeac8dee7f09d23fae4c8928eb7 (patch) | |
| tree | a1dd3ae46bf575cb8296df38568dfce237c6ecd8 /modules/lightmapper_rd | |
| parent | 30b6db99a99a94c64d906c1b828ff44f79a1bc75 (diff) | |
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/lightmapper_rd')
| -rw-r--r-- | modules/lightmapper_rd/lightmapper_rd.cpp | 2 | ||||
| -rw-r--r-- | modules/lightmapper_rd/lightmapper_rd.h | 2 | ||||
| -rw-r--r-- | modules/lightmapper_rd/register_types.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/modules/lightmapper_rd/lightmapper_rd.cpp b/modules/lightmapper_rd/lightmapper_rd.cpp index 4de523baa0..1ef991841b 100644 --- a/modules/lightmapper_rd/lightmapper_rd.cpp +++ b/modules/lightmapper_rd/lightmapper_rd.cpp @@ -29,8 +29,8 @@ /*************************************************************************/ #include "lightmapper_rd.h" +#include "core/config/project_settings.h" #include "core/math/geometry_2d.h" -#include "core/project_settings.h" #include "lm_blendseams.glsl.gen.h" #include "lm_compute.glsl.gen.h" #include "lm_raster.glsl.gen.h" diff --git a/modules/lightmapper_rd/lightmapper_rd.h b/modules/lightmapper_rd/lightmapper_rd.h index cd000414cf..e17b5473a8 100644 --- a/modules/lightmapper_rd/lightmapper_rd.h +++ b/modules/lightmapper_rd/lightmapper_rd.h @@ -31,7 +31,7 @@ #ifndef LIGHTMAPPER_RD_H #define LIGHTMAPPER_RD_H -#include "core/local_vector.h" +#include "core/templates/local_vector.h" #include "scene/3d/lightmapper.h" #include "scene/resources/mesh.h" #include "servers/rendering/rendering_device.h" diff --git a/modules/lightmapper_rd/register_types.cpp b/modules/lightmapper_rd/register_types.cpp index 0e6d7590cc..b16adaf5d6 100644 --- a/modules/lightmapper_rd/register_types.cpp +++ b/modules/lightmapper_rd/register_types.cpp @@ -30,7 +30,7 @@ #include "register_types.h" -#include "core/project_settings.h" +#include "core/config/project_settings.h" #include "lightmapper_rd.h" #include "scene/3d/lightmapper.h" |