1 files changed, 28 insertions, 21 deletions

diff --git a/scene/3d/remote_transform.cpp b/scene/3d/remote_transform.cpp
index c12e49fb47..76b0b0c92f 100644
--- a/scene/3d/remote_transform.cpp
+++ b/scene/3d/remote_transform.cpp
@@ -5,8 +5,8 @@
 /*                           GODOT ENGINE                                */
 /*                      https://godotengine.org                          */
 /*************************************************************************/
-/* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md)    */
+/* Copyright (c) 2007-2019 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2019 Godot Engine contributors (cf. AUTHORS.md)    */
 /*                                                                       */
 /* Permission is hereby granted, free of charge, to any person obtaining */
 /* a copy of this software and associated documentation files (the       */
@@ -63,38 +63,40 @@ void RemoteTransform::_update_remote() {
 		if (update_remote_position && update_remote_rotation && update_remote_scale) {
 			n->set_global_transform(get_global_transform());
 		} else {
-			Transform n_trans = n->get_global_transform();
 			Transform our_trans = get_global_transform();
 
-			if (!update_remote_position)
-				our_trans.set_origin(n_trans.get_origin());
+			if (update_remote_rotation)
+				n->set_rotation(our_trans.basis.get_rotation());
 
-			n->set_global_transform(our_trans);
+			if (update_remote_scale)
+				n->set_scale(our_trans.basis.get_scale());
 
-			if (!update_remote_rotation)
-				n->set_rotation(n_trans.basis.get_rotation());
+			if (update_remote_position) {
+				Transform n_trans = n->get_global_transform();
 
-			if (!update_remote_scale)
-				n->set_scale(n_trans.basis.get_scale());
+				n_trans.set_origin(our_trans.get_origin());
+				n->set_global_transform(n_trans);
+			}
 		}
 
 	} else {
 		if (update_remote_position && update_remote_rotation && update_remote_scale) {
-			n->set_global_transform(get_global_transform());
+			n->set_transform(get_transform());
 		} else {
-			Transform n_trans = n->get_transform();
 			Transform our_trans = get_transform();
 
-			if (!update_remote_position)
-				our_trans.set_origin(n_trans.get_origin());
+			if (update_remote_rotation)
+				n->set_rotation(our_trans.basis.get_rotation());
 
-			n->set_transform(our_trans);
+			if (update_remote_scale)
+				n->set_scale(our_trans.basis.get_scale());
 
-			if (!update_remote_rotation)
-				n->set_rotation(n_trans.basis.get_rotation());
+			if (update_remote_position) {
+				Transform n_trans = n->get_transform();
 
-			if (!update_remote_scale)
-				n->set_scale(n_trans.basis.get_scale());
+				n_trans.set_origin(our_trans.get_origin());
+				n->set_transform(n_trans);
+			}
 		}
 	}
 }
@@ -103,7 +105,7 @@ void RemoteTransform::_notification(int p_what) {
 
 	switch (p_what) {
 
-		case NOTIFICATION_READY: {
+		case NOTIFICATION_ENTER_TREE: {
 
 			_update_cache();
 
@@ -172,10 +174,14 @@ bool RemoteTransform::get_update_scale() const {
 	return update_remote_scale;
 }
 
+void RemoteTransform::force_update_cache() {
+	_update_cache();
+}
+
 String RemoteTransform::get_configuration_warning() const {
 
 	if (!has_node(remote_node) || !Object::cast_to<Spatial>(get_node(remote_node))) {
-		return TTR("Path property must point to a valid Spatial node to work.");
+		return TTR("The \"Remote Path\" property must point to a valid Spatial or Spatial-derived node to work.");
 	}
 
 	return String();
@@ -185,6 +191,7 @@ void RemoteTransform::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("set_remote_node", "path"), &RemoteTransform::set_remote_node);
 	ClassDB::bind_method(D_METHOD("get_remote_node"), &RemoteTransform::get_remote_node);
+	ClassDB::bind_method(D_METHOD("force_update_cache"), &RemoteTransform::force_update_cache);
 
 	ClassDB::bind_method(D_METHOD("set_use_global_coordinates", "use_global_coordinates"), &RemoteTransform::set_use_global_coordinates);
 	ClassDB::bind_method(D_METHOD("get_use_global_coordinates"), &RemoteTransform::get_use_global_coordinates);