godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #63084 from madmiraal/fix-56336-3.x

This commit is contained in:
Rémi Verschelde 2022-07-18 09:31:58 +02:00 committed by GitHub
parent c7d143dad2 162cb5748a
commit 090d9f6d25
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scene/2d/camera_2d.cpp
View File

@ -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 {

4
scene/main/scene_tree.cpp
View File

@ -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;