瀏覽代碼

Merge pull request #85594 from addmix/camera3d-current-bug

Prevent `Camera3D.current` from being set to `true` automatically in the editor.
Yuri Sizov 1 年之前
父節點
當前提交
252c462a9d
共有 1 個文件被更改,包括 1 次插入1 次删除
  1. 1 1
      scene/3d/camera_3d.cpp

+ 1 - 1
scene/3d/camera_3d.cpp

@@ -272,7 +272,7 @@ void Camera3D::clear_current(bool p_enable_next) {
 	if (get_viewport()->get_camera_3d() == this) {
 	if (get_viewport()->get_camera_3d() == this) {
 		get_viewport()->_camera_3d_set(nullptr);
 		get_viewport()->_camera_3d_set(nullptr);
 
 
-		if (p_enable_next) {
+		if (p_enable_next && !Engine::get_singleton()->is_editor_hint()) {
 			get_viewport()->_camera_3d_make_next_current(this);
 			get_viewport()->_camera_3d_make_next_current(this);
 		}
 		}
 	}
 	}