godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Merge pull request #81295 from aaronfranke/fix-compile-no-3d 

Fix compiling with 3D disabled due to unused navigation variable
This commit is contained in:
Yuri Sizov 2023-09-05 15:14:17 +02:00
parent c9bf824124 93cf3391bd
commit d90918194f
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/navigation/godot_navigation_server.h
View File

@ -56,7 +56,9 @@
void MERGE(_cmd_, F_NAME)(T_0 D_0, T_1 D_1) void MERGE(_cmd_, F_NAME)(T_0 D_0, T_1 D_1)
class GodotNavigationServer; class GodotNavigationServer;
#ifndef _3D_DISABLED
class NavMeshGenerator3D; class NavMeshGenerator3D;
#endif // _3D_DISABLED
struct SetCommand { struct SetCommand {
virtual ~SetCommand() {} virtual ~SetCommand() {}
@ -80,7 +82,9 @@ class GodotNavigationServer : public NavigationServer3D {
LocalVector<NavMap *> active_maps; LocalVector<NavMap *> active_maps;
LocalVector<uint32_t> active_maps_update_id; LocalVector<uint32_t> active_maps_update_id;
#ifndef _3D_DISABLED
NavMeshGenerator3D *navmesh_generator_3d = nullptr; NavMeshGenerator3D *navmesh_generator_3d = nullptr;
#endif // _3D_DISABLED
// Performance Monitor // Performance Monitor
int pm_region_count = 0; int pm_region_count = 0;