Moved from the TERRAMAN_2D_PRESENT define to the module system's equivalent define aswell.

This commit is contained in:
Relintai 2022-10-05 15:19:59 +02:00
parent 7357a4f65c
commit 029a6671b4
3 changed files with 3 additions and 6 deletions

View File

@ -6,9 +6,6 @@ module_env = env.Clone()
import version
if os.path.isdir('../terraman_2d'):
module_env.Append(CPPDEFINES=['TERRAMAN_2D_PRESENT'])
sources = [
"register_types.cpp",

View File

@ -871,7 +871,7 @@ void Prop2DMesher::bake_colors_lights() {
}
}
#ifdef TERRAMAN_2D_PRESENT
#ifdef MODULE_TERRAMAN_2D_ENABLED
void Prop2DMesher::bake_lights(MeshInstance *node, Vector<Ref<Terrain2DLight>> &lights) {
/*
ERR_FAIL_COND(node == NULL);

View File

@ -41,7 +41,7 @@ SOFTWARE.
#include "../mesh_data_resource/mesh_data_resource.h"
#endif
#ifdef TERRAMAN_2D_PRESENT
#ifdef MODULE_TERRAMAN_2D_ENABLED
#include "../terraman_2d/data/terrain_2d_light.h"
#endif
@ -149,7 +149,7 @@ public:
void bake_colors_lights_rao();
void bake_colors_lights();
#ifdef TERRAMAN_2D_PRESENT
#ifdef MODULE_TERRAMAN_2D_ENABLED
void bake_lights(MeshInstance *node, Vector<Ref<Terrain2DLight>> &lights);
#endif