From 95dc15b75096b7f4017b16ddae9066ee2deb3934 Mon Sep 17 00:00:00 2001
From: Juan Linietsky
Date: Fri, 17 Jun 2016 16:45:10 -0300
Subject: Send body inout notifications after state is applied, fixes #4683

---
 scene/3d/physics_body.cpp | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

(limited to 'scene/3d/physics_body.cpp')

diff --git a/scene/3d/physics_body.cpp b/scene/3d/physics_body.cpp
index 243cb31ac..116f967bd 100644
--- a/scene/3d/physics_body.cpp
+++ b/scene/3d/physics_body.cpp
@@ -397,6 +397,18 @@ void RigidBody::_direct_state_changed(Object *p_state) {
 	state=(PhysicsDirectBodyState*)p_state; //trust it
 #endif
 
+	set_ignore_transform_notification(true);
+	set_global_transform(state->get_transform());
+	linear_velocity=state->get_linear_velocity();
+	angular_velocity=state->get_angular_velocity();
+	if(sleeping!=state->is_sleeping()) {
+		sleeping=state->is_sleeping();
+		emit_signal(SceneStringNames::get_singleton()->sleeping_state_changed);
+	}
+	if (get_script_instance())
+		get_script_instance()->call("_integrate_forces",state);
+	set_ignore_transform_notification(false);
+
 	if (contact_monitor) {
 
 		contact_monitor->locked=true;
@@ -484,17 +496,7 @@ void RigidBody::_direct_state_changed(Object *p_state) {
 
 	}
 
-	set_ignore_transform_notification(true);
-	set_global_transform(state->get_transform());
-	linear_velocity=state->get_linear_velocity();
-	angular_velocity=state->get_angular_velocity();
-	if(sleeping!=state->is_sleeping()) {
-		sleeping=state->is_sleeping();
-		emit_signal(SceneStringNames::get_singleton()->sleeping_state_changed);
-	}
-	if (get_script_instance())
-		get_script_instance()->call("_integrate_forces",state);
-	set_ignore_transform_notification(false);
+
 
 	state=NULL;
 }
-- 
cgit v1.2.3-70-g09d2