浏览代码

Merge pull request #55544 from V-Sekai/audio_camera_null_mitigation

Rémi Verschelde 3 年之前
父节点
当前提交
ede7614fe2
共有 1 个文件被更改,包括 6 次插入0 次删除
  1. 6 0
      scene/3d/audio_stream_player_3d.cpp

+ 6 - 0
scene/3d/audio_stream_player_3d.cpp

@@ -391,7 +391,13 @@ Vector<AudioFrame> AudioStreamPlayer3D::_update_panning() {
 	PhysicsDirectSpaceState3D *space_state = PhysicsServer3D::get_singleton()->space_get_direct_state(world_3d->get_space());
 	PhysicsDirectSpaceState3D *space_state = PhysicsServer3D::get_singleton()->space_get_direct_state(world_3d->get_space());
 
 
 	for (Camera3D *camera : cameras) {
 	for (Camera3D *camera : cameras) {
+		if (!camera) {
+			continue;
+		}
 		Viewport *vp = camera->get_viewport();
 		Viewport *vp = camera->get_viewport();
+		if (!vp) {
+			continue;
+		}
 		if (!vp->is_audio_listener_3d()) {
 		if (!vp->is_audio_listener_3d()) {
 			continue;
 			continue;
 		}
 		}