6 files changed, 34 insertions, 9 deletions

diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp
index 97f0db97c2..303896b41a 100644
--- a/scene/gui/control.cpp
+++ b/scene/gui/control.cpp
@@ -480,10 +480,10 @@ void Control::_notification(int p_notification) {
 			if (is_set_as_toplevel()) {
 				data.SI=get_viewport()->_gui_add_subwindow_control(this);
 
-				/*if (data.theme.is_null() && data.parent && data.parent->data.theme_owner) {
+				if (data.theme.is_null() && data.parent && data.parent->data.theme_owner) {
 					data.theme_owner=data.parent->data.theme_owner;
 					notification(NOTIFICATION_THEME_CHANGED);
-				}*/
+				}
 
 			} else {
 
@@ -519,10 +519,10 @@ void Control::_notification(int p_notification) {
 
 				if (parent_control) {
 					//do nothing, has a parent control
-					/*if (data.theme.is_null() && parent_control->data.theme_owner) {
+					if (data.theme.is_null() && parent_control->data.theme_owner) {
 						data.theme_owner=parent_control->data.theme_owner;
 						notification(NOTIFICATION_THEME_CHANGED);
-					}*/
+					}
 				} else if (subwindow) {
 					//is a subwindow (process input before other controls for that canvas)
 					data.SI=get_viewport()->_gui_add_subwindow_control(this);
diff --git a/scene/gui/file_dialog.cpp b/scene/gui/file_dialog.cpp
index f942f15ed0..b0214b8648 100644
--- a/scene/gui/file_dialog.cpp
+++ b/scene/gui/file_dialog.cpp
@@ -403,11 +403,12 @@ void FileDialog::update_file_list() {
 	while(!files.empty()) {
 
 		bool match=patterns.empty();
+		String match_str;
 
 		for(List<String>::Element *E=patterns.front();E;E=E->next()) {
 
 			if (files.front()->get().matchn(E->get())) {
-
+				match_str=E->get();
 				match=true;
 				break;
 			}
@@ -432,14 +433,14 @@ void FileDialog::update_file_list() {
 			d["dir"]=false;
 			ti->set_metadata(0,d);
 
-			if (file->get_text()==files.front()->get())
+			if (file->get_text()==files.front()->get() || match_str==files.front()->get())
 				ti->select(0);
 		}
 
 		files.pop_front();
 	}
 
-	if (tree->get_root() && tree->get_root()->get_children())
+	if (tree->get_root() && tree->get_root()->get_children() && tree->get_selected()==NULL)
 		tree->get_root()->get_children()->select(0);
 
 	files.clear();
diff --git a/scene/main/instance_placeholder.cpp b/scene/main/instance_placeholder.cpp
index fb047ea5e4..15045a73d5 100644
--- a/scene/main/instance_placeholder.cpp
+++ b/scene/main/instance_placeholder.cpp
@@ -101,11 +101,28 @@ void InstancePlaceholder::replace_by_instance(const Ref<PackedScene> &p_custom_s
 	base->remove_child(this);
 	base->add_child(scene);
 	base->move_child(scene,pos);
-
 }
 
+Dictionary InstancePlaceholder::get_stored_values(bool p_with_order) {
+
+	Dictionary ret;
+	StringArray order;
+
+	for(List<PropSet>::Element *E=stored_values.front();E;E=E->next()) {
+		ret[E->get().name] = E->get().value;
+		if (p_with_order)
+			order.push_back(E->get().name);
+	};
+
+	if (p_with_order)
+		ret[".order"] = order;
+
+	return ret;
+};
+
 void InstancePlaceholder::_bind_methods() {
 
+	ObjectTypeDB::bind_method(_MD("get_stored_values","with_order"),&InstancePlaceholder::get_stored_values,DEFVAL(false));
 	ObjectTypeDB::bind_method(_MD("replace_by_instance","custom_scene:PackedScene"),&InstancePlaceholder::replace_by_instance,DEFVAL(Variant()));
 	ObjectTypeDB::bind_method(_MD("get_instance_path"),&InstancePlaceholder::get_instance_path);
 }
diff --git a/scene/main/instance_placeholder.h b/scene/main/instance_placeholder.h
index ef76686196..cacba49b39 100644
--- a/scene/main/instance_placeholder.h
+++ b/scene/main/instance_placeholder.h
@@ -57,6 +57,8 @@ public:
 	void set_instance_path(const String& p_name);
 	String get_instance_path() const;
 
+	Dictionary get_stored_values(bool p_with_order = false);
+
 	void replace_by_instance(const Ref<PackedScene>& p_custom_scene=Ref<PackedScene>());
 
 	InstancePlaceholder();
diff --git a/scene/main/node.cpp b/scene/main/node.cpp
index f4fb48682c..78a5cb7302 100644
--- a/scene/main/node.cpp
+++ b/scene/main/node.cpp
@@ -172,7 +172,10 @@ void Node::_propagate_ready() {
 		data.children[i]->_propagate_ready();
 	}
 	data.blocked--;
-	notification(NOTIFICATION_READY);
+	if(!data.ready_notified) {
+		data.ready_notified=true;
+		notification(NOTIFICATION_READY);
+	}
 
 }
 
@@ -2999,6 +3002,7 @@ Node::Node() {
 	data.fixed_process=false;
 	data.idle_process=false;
 	data.inside_tree=false;
+	data.ready_notified=false;
 
 	data.owner=NULL;
 	data.OW=NULL;
diff --git a/scene/main/node.h b/scene/main/node.h
index f18dc81195..7b1444f607 100644
--- a/scene/main/node.h
+++ b/scene/main/node.h
@@ -103,6 +103,7 @@ private:
 		StringName name;
 		SceneTree *tree;
 		bool inside_tree;
+		bool ready_notified;
 #ifdef TOOLS_ENABLED
 		NodePath import_path; //path used when imported, used by scene editors to keep tracking
 #endif