5 files changed, 25 insertions, 3 deletions
diff --git a/scene/2d/canvas_item.cpp b/scene/2d/canvas_item.cpp
index 35b453d71d..316097fbcf 100644
--- a/scene/2d/canvas_item.cpp
+++ b/scene/2d/canvas_item.cpp
@@ -1193,6 +1193,14 @@ bool CanvasItem::is_local_transform_notification_enabled() const {
 	return notify_local_transform;
 }
 
+int CanvasItem::get_canvas_layer() const {
+
+	if (canvas_layer)
+		return canvas_layer->get_layer();
+	else
+		return 0;
+}
+
 CanvasItem::CanvasItem() : xform_change(this) {
 
 
diff --git a/scene/2d/canvas_item.h b/scene/2d/canvas_item.h
index 5d10523261..05a2e725e9 100644
--- a/scene/2d/canvas_item.h
+++ b/scene/2d/canvas_item.h
@@ -268,6 +268,7 @@ public:
 	void set_notify_local_transform(bool p_enable);
 	bool is_local_transform_notification_enabled() const;
 
+	int get_canvas_layer() const;
 
 	CanvasItem();
 	~CanvasItem();
diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp
index dce0a4ac0e..71a0f50240 100644
--- a/scene/gui/control.cpp
+++ b/scene/gui/control.cpp
@@ -2071,6 +2071,8 @@ Control *Control::get_root_parent_control() const {
 	return const_cast<Control*>(root);
 }
 
+
+
 void Control::_bind_methods() {
 
 
diff --git a/scene/gui/control.h b/scene/gui/control.h
index a16d88a6df..74d40b7579 100644
--- a/scene/gui/control.h
+++ b/scene/gui/control.h
@@ -97,7 +97,12 @@ private:
 
 	struct CComparator {
 
-		bool operator()(const Control* p_a, const Control* p_b) const { return p_b->is_greater_than(p_a); }
+		bool operator()(const Control* p_a, const Control* p_b) const {
+			if (p_a->get_canvas_layer()==p_b->get_canvas_layer())
+				return p_b->is_greater_than(p_a);
+			else
+				return p_a->get_canvas_layer() < p_b->get_canvas_layer();
+		}
 	};
 
 	struct Data {
diff --git a/scene/resources/scene_format_text.cpp b/scene/resources/scene_format_text.cpp
index 4520171eac..f3dcf16e28 100644
--- a/scene/resources/scene_format_text.cpp
+++ b/scene/resources/scene_format_text.cpp
@@ -85,8 +85,7 @@ Error ResourceInteractiveLoaderText::_parse_ext_resource(VariantParser::Stream*
 	r_res=ResourceLoader::load(path,type);
 
 	if (r_res.is_null()) {
-		r_err_str="Couldn't load external resource: "+path;
-		return ERR_PARSE_ERROR;
+		WARN_PRINT(String("Couldn't load external resource: "+path).utf8().get_data());
 	}
 
 	VariantParser::get_token(p_stream,token,line,r_err_str);
@@ -394,6 +393,13 @@ Error ResourceInteractiveLoaderText::poll() {
 
 		int node_id = packed_scene->get_state()->add_node(parent,owner,type,name,instance);
 
+		if (next_tag.fields.has("groups")) {
+
+			Array groups = next_tag.fields["groups"];
+			for (int i=0;i<groups.size();i++) {
+				packed_scene->get_state()->add_node_group(node_id,packed_scene->get_state()->add_name(groups[i]));
+			}
+		}
 
 		while(true) {