diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-10-16 14:46:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-16 14:46:01 +0200 |
| commit | b4dd1afa74a4ea98ed05707f27b2abd6f5a07334 (patch) | |
| tree | 35b02fa0278177f578679d6bfc08b68906f5670c /scene | |
| parent | 8b4289021777c11b79b5ced465d27701ca2e8469 (diff) | |
| parent | 0e8c7f58db01e700a1bda9371cf5af2bead95989 (diff) | |
Merge pull request #22922 from mrcdk/fix_area_bus_override
Fixes Area and Area2D audio bus override
Diffstat (limited to 'scene')
| -rw-r--r-- | scene/2d/audio_stream_player_2d.cpp | 2 | ||||
| -rw-r--r-- | scene/3d/audio_stream_player_3d.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scene/2d/audio_stream_player_2d.cpp b/scene/2d/audio_stream_player_2d.cpp index a1ae05d971..9de72a4fcd 100644 --- a/scene/2d/audio_stream_player_2d.cpp +++ b/scene/2d/audio_stream_player_2d.cpp @@ -179,7 +179,7 @@ void AudioStreamPlayer2D::_notification(int p_what) { Physics2DDirectSpaceState::ShapeResult sr[MAX_INTERSECT_AREAS]; - int areas = space_state->intersect_point(global_pos, sr, MAX_INTERSECT_AREAS, Set<RID>(), area_mask); + int areas = space_state->intersect_point(global_pos, sr, MAX_INTERSECT_AREAS, Set<RID>(), area_mask, false, true); for (int i = 0; i < areas; i++) { diff --git a/scene/3d/audio_stream_player_3d.cpp b/scene/3d/audio_stream_player_3d.cpp index abf022ecb3..7ad43b722d 100644 --- a/scene/3d/audio_stream_player_3d.cpp +++ b/scene/3d/audio_stream_player_3d.cpp @@ -290,7 +290,7 @@ void AudioStreamPlayer3D::_notification(int p_what) { PhysicsDirectSpaceState::ShapeResult sr[MAX_INTERSECT_AREAS]; - int areas = space_state->intersect_point(global_pos, sr, MAX_INTERSECT_AREAS, Set<RID>(), area_mask); + int areas = space_state->intersect_point(global_pos, sr, MAX_INTERSECT_AREAS, Set<RID>(), area_mask, false, true); Area *area = NULL; for (int i = 0; i < areas; i++) { |