Skip to content

Commit

Permalink
Merge pull request #63084 from madmiraal/fix-56336-3.x
Browse files Browse the repository at this point in the history
  • Loading branch information
akien-mga authored Jul 18, 2022
2 parents c7d143d + 162cb57 commit 090d9f6
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion scene/2d/camera_2d.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@ void Camera2D::clear_current() {
void Camera2D::set_limit(Margin p_margin, int p_limit) {
ERR_FAIL_INDEX((int)p_margin, 4);
limit[p_margin] = p_limit;
update();
_update_scroll();
}

int Camera2D::get_limit(Margin p_margin) const {
Expand Down
4 changes: 2 additions & 2 deletions scene/main/scene_tree.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2168,8 +2168,8 @@ SceneTree::SceneTree() {
GLOBAL_DEF("debug/shapes/collision/draw_2d_outlines", true);

tree_version = 1;
physics_process_time = 1;
idle_process_time = 1;
physics_process_time = 0.f;
idle_process_time = 0.f;

root = nullptr;
input_handled = false;
Expand Down

0 comments on commit 090d9f6

Please sign in to comment.