asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Rémi Verschelde 2022-07-18 09:31:58 +02:00 committed by GitHub
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) { void Camera2D::set_limit(Margin p_margin, int p_limit) {
ERR_FAIL_INDEX((int)p_margin, 4); ERR_FAIL_INDEX((int)p_margin, 4);
limit[p_margin] = p_limit; limit[p_margin] = p_limit;
update(); _update_scroll();
} }
int Camera2D::get_limit(Margin p_margin) const { 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); GLOBAL_DEF("debug/shapes/collision/draw_2d_outlines", true);
tree_version = 1; tree_version = 1;
physics_process_time = 1; physics_process_time = 0.f;
idle_process_time = 1; idle_process_time = 0.f;
root = nullptr; root = nullptr;
input_handled = false; input_handled = false;