diff options
| author | George L. Albany <Megacake1234@gmail.com> | 2024-11-26 19:30:58 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-26 19:30:58 +0000 |
| commit | b06d20bf39d15ec736d08d4e4fcb32e0c3c1ce1e (patch) | |
| tree | 79c2a4c34f2d888ff962d76edf474c518d1abdea /main | |
| parent | c5b1645e60a59c0292c04bece3fdb0715a61afea (diff) | |
| parent | e58e18261ea7ed3978146ef8d77a900be2601be3 (diff) | |
| download | redot-engine-b06d20bf39d15ec736d08d4e4fcb32e0c3c1ce1e.tar.gz | |
Merge pull request #885 from Spartan322/merge/d09d82d
Merge commit godotengine/godot@d09d82d
Diffstat (limited to 'main')
| -rw-r--r-- | main/performance.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/main/performance.cpp b/main/performance.cpp index 7132242c44..909dcb6ec3 100644 --- a/main/performance.cpp +++ b/main/performance.cpp @@ -134,11 +134,9 @@ String Performance::get_monitor_name(Monitor p_monitor) const { PNAME("physics_2d/active_objects"), PNAME("physics_2d/collision_pairs"), PNAME("physics_2d/islands"), -#ifndef _3D_DISABLED PNAME("physics_3d/active_objects"), PNAME("physics_3d/collision_pairs"), PNAME("physics_3d/islands"), -#endif // _3D_DISABLED PNAME("audio/driver/output_latency"), PNAME("navigation/active_maps"), PNAME("navigation/regions"), @@ -282,11 +280,9 @@ Performance::MonitorType Performance::get_monitor_type(Monitor p_monitor) const MONITOR_TYPE_QUANTITY, MONITOR_TYPE_QUANTITY, MONITOR_TYPE_QUANTITY, -#ifndef _3D_DISABLED MONITOR_TYPE_QUANTITY, MONITOR_TYPE_QUANTITY, MONITOR_TYPE_QUANTITY, -#endif // _3D_DISABLED MONITOR_TYPE_TIME, MONITOR_TYPE_QUANTITY, MONITOR_TYPE_QUANTITY, |