Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-08 06:09:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #8999 from RandomShaper/fix-physics-2.1

Browse source 
Fix multiple 2D & 3D physics issues (2.1)
This commit is contained in:
Rémi Verschelde 2017-06-25 11:12:37 +02:00 • committed by GitHub
commit 148a9e384b
27 changed files with 243 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

5
scene/3d/area.cpp
View file

@ -275,13 +275,13 @@ void Area::_notification(int p_what) {
switch (p_what) {
case NOTIFICATION_EXIT_TREE: {
case NOTIFICATION_EXIT_WORLD: {
monitoring_stored = monitoring;
set_enable_monitoring(false);
_clear_monitoring();
} break;
case NOTIFICATION_ENTER_TREE: {
case NOTIFICATION_ENTER_WORLD: {
if (monitoring_stored) {
set_enable_monitoring(true);
@ -646,6 +646,7 @@ Area::Area()
angular_damp = 1;
priority = 0;
monitoring = false;
monitorable = false;
collision_mask = 1;
layer_mask = 1;
monitoring_stored = false;