From 8078b5ecf68a6a834284167bc7b43ff2c646b204 Mon Sep 17 00:00:00 2001
From: Robert Hernandez <killerjaguar26@gmail.com>
Date: Sat, 1 Apr 2017 00:07:35 -0400
Subject: [PATCH] Fixed Node2D/Control not updating properties

---
 scene/2d/node_2d.cpp  | 22 +++++++++++++---------
 scene/gui/control.cpp | 12 ++++++------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/scene/2d/node_2d.cpp b/scene/2d/node_2d.cpp
index 1ba6ec46cf3..16b63422995 100644
--- a/scene/2d/node_2d.cpp
+++ b/scene/2d/node_2d.cpp
@@ -63,9 +63,10 @@ void Node2D::edit_set_state(const Variant &p_state) {
 	angle = state[1];
 	_scale = state[2];
 	_update_transform();
-	_change_notify("transform/rot");
-	_change_notify("transform/scale");
-	_change_notify("transform/pos");
+	_change_notify("rotation");
+	_change_notify("rotation_deg");
+	_change_notify("scale");
+	_change_notify("position");
 }
 
 void Node2D::edit_set_rect(const Rect2 &p_edit_rect) {
@@ -95,15 +96,16 @@ void Node2D::edit_set_rect(const Rect2 &p_edit_rect) {
 	_scale *= new_scale;
 
 	_update_transform();
-	_change_notify("transform/scale");
-	_change_notify("transform/pos");
+	_change_notify("scale");
+	_change_notify("position");
 }
 
 void Node2D::edit_rotate(float p_rot) {
 
 	angle += p_rot;
 	_update_transform();
-	_change_notify("transform/rot");
+	_change_notify("rotation");
+	_change_notify("rotation_deg");
 }
 
 void Node2D::_update_xform_values() {
@@ -134,7 +136,7 @@ void Node2D::set_position(const Point2 &p_pos) {
 		((Node2D *)this)->_update_xform_values();
 	pos = p_pos;
 	_update_transform();
-	_change_notify("transform/pos");
+	_change_notify("position");
 }
 
 void Node2D::set_rotation(float p_radians) {
@@ -143,7 +145,8 @@ void Node2D::set_rotation(float p_radians) {
 		((Node2D *)this)->_update_xform_values();
 	angle = p_radians;
 	_update_transform();
-	_change_notify("transform/rot");
+	_change_notify("rotation");
+	_change_notify("rotation_deg");
 }
 
 void Node2D::set_rotation_in_degrees(float p_degrees) {
@@ -169,7 +172,7 @@ void Node2D::set_scale(const Size2 &p_scale) {
 	if (_scale.y == 0)
 		_scale.y = CMP_EPSILON;
 	_update_transform();
-	_change_notify("transform/scale");
+	_change_notify("scale");
 }
 
 Point2 Node2D::get_position() const {
@@ -349,6 +352,7 @@ void Node2D::set_z(int p_z) {
 	ERR_FAIL_COND(p_z > VS::CANVAS_ITEM_Z_MAX);
 	z = p_z;
 	VS::get_singleton()->canvas_item_set_z(get_canvas_item(), z);
+	_change_notify("z");
 }
 
 void Node2D::set_z_as_relative(bool p_enabled) {
diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp
index d2f3eea721f..7f9944833a9 100644
--- a/scene/gui/control.cpp
+++ b/scene/gui/control.cpp
@@ -1347,12 +1347,12 @@ Control::AnchorType Control::get_anchor(Margin p_margin) const {
 void Control::_change_notify_margins() {
 
 	// this avoids sending the whole object data again on a change
-	_change_notify("margin/left");
-	_change_notify("margin/top");
-	_change_notify("margin/right");
-	_change_notify("margin/bottom");
-	_change_notify("rect/pos");
-	_change_notify("rect/size");
+	_change_notify("margin_left");
+	_change_notify("margin_top");
+	_change_notify("margin_right");
+	_change_notify("margin_bottom");
+	_change_notify("rect_pos");
+	_change_notify("rect_size");
 }
 
 void Control::set_margin(Margin p_margin, float p_value) {