godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases Wiki Activity

Fix custom viewports in Camera2D

Browse Source
This commit is contained in:
kobewi
2023-02-23 23:21:50 +01:00
parent e930c8d383
commit cf50eb130e
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
scene/2d/camera_2d.cpp
View File

@@ -414,15 +414,19 @@ Camera2D::Camera2DProcessCallback Camera2D::get_process_callback() const {
} }
void Camera2D::_make_current(Object *p_which) { void Camera2D::_make_current(Object *p_which) {
if (!viewport || (custom_viewport && !ObjectDB::get_instance(custom_viewport_id))) {
return;
}
if (p_which == this) { if (p_which == this) {
if (is_inside_tree()) { if (is_inside_tree()) {
get_viewport()->_camera_2d_set(this); viewport->_camera_2d_set(this);
queue_redraw(); queue_redraw();
} }
} else { } else {
if (is_inside_tree()) { if (is_inside_tree()) {
if (get_viewport()->get_camera_2d() == this) { if (viewport->get_camera_2d() == this) {
get_viewport()->_camera_2d_set(nullptr); viewport->_camera_2d_set(nullptr);
} }
queue_redraw(); queue_redraw();
} }
@@ -449,7 +453,7 @@ void Camera2D::make_current() {
void Camera2D::clear_current() { void Camera2D::clear_current() {
ERR_FAIL_COND(!is_current()); ERR_FAIL_COND(!is_current());
if (viewport && !(custom_viewport && !ObjectDB::get_instance(custom_viewport_id))) { if (viewport && !(custom_viewport && !ObjectDB::get_instance(custom_viewport_id)) && viewport->is_inside_tree()) {
viewport->assign_next_enabled_camera_2d(group_name); viewport->assign_next_enabled_camera_2d(group_name);
} }
} }