diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-04-16 08:27:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-16 08:27:13 +0200 |
| commit | 92eceb45ecda859bcad8e7a647466d535e11420f (patch) | |
| tree | a493f29e7970c3c5d43fb226630eaa42ce07a291 /scene/main | |
| parent | 3d8c971ff8936a7c57bdae536d050207077a9427 (diff) | |
| parent | 52d6a7a7ff29f51355e427cd2a9b568605719896 (diff) | |
Merge pull request #60281 from Calinou/viewport-audio-listener3d-fix-property-grouping
Fix the Audio Listener 3D property not being grouped with 2D in Viewport
Diffstat (limited to 'scene/main')
| -rw-r--r-- | scene/main/viewport.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp index d93e7b4b0b..b78f07b6d0 100644 --- a/scene/main/viewport.cpp +++ b/scene/main/viewport.cpp @@ -3726,7 +3726,6 @@ void Viewport::_bind_methods() { ADD_PROPERTY(PropertyInfo(Variant::BOOL, "disable_3d"), "set_disable_3d", "is_3d_disabled"); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "use_xr"), "set_use_xr", "is_using_xr"); - ADD_PROPERTY(PropertyInfo(Variant::BOOL, "audio_listener_enable_3d"), "set_as_audio_listener_3d", "is_audio_listener_3d"); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "own_world_3d"), "set_use_own_world_3d", "is_using_own_world_3d"); ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "world_3d", PROPERTY_HINT_RESOURCE_TYPE, "World3D"), "set_world_3d", "get_world_3d"); #endif // _3D_DISABLED @@ -3754,6 +3753,9 @@ void Viewport::_bind_methods() { ADD_PROPERTY(PropertyInfo(Variant::INT, "canvas_item_default_texture_repeat", PROPERTY_HINT_ENUM, "Disabled,Enabled,Mirror"), "set_default_canvas_item_texture_repeat", "get_default_canvas_item_texture_repeat"); ADD_GROUP("Audio Listener", "audio_listener_"); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "audio_listener_enable_2d"), "set_as_audio_listener_2d", "is_audio_listener_2d"); +#ifndef _3D_DISABLED + ADD_PROPERTY(PropertyInfo(Variant::BOOL, "audio_listener_enable_3d"), "set_as_audio_listener_3d", "is_audio_listener_3d"); +#endif ADD_GROUP("Physics", "physics_"); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "physics_object_picking"), "set_physics_object_picking", "get_physics_object_picking"); ADD_GROUP("GUI", "gui_"); |