From 53beeb774b36b7af391e61fffeceb9f7ed3e299e Mon Sep 17 00:00:00 2001
From: Franklin Sobrinho
Date: Wed, 20 Jul 2016 14:09:03 -0300
Subject: "FileSystem" dock now instance all selected scenes in one action

---
 tools/editor/editor_node.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'tools/editor/editor_node.cpp')

diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp
index 3f93c0591..42c81c68f 100644
--- a/tools/editor/editor_node.cpp
+++ b/tools/editor/editor_node.cpp
@@ -3822,6 +3822,11 @@ void EditorNode::request_instance_scene(const String &p_path) {
 
 }
 
+void EditorNode::request_instance_scenes(const Vector<String>& p_files) {
+
+	scene_tree_dock->instance_scenes(p_files);
+}
+
 FileSystemDock *EditorNode::get_scenes_dock() {
 
 	return scenes_dock;
@@ -3831,10 +3836,9 @@ SceneTreeDock *EditorNode::get_scene_tree_dock() {
 	return scene_tree_dock;
 }
 
-void EditorNode::_instance_request(const String& p_path){
-
+void EditorNode::_instance_request(const Vector<String>& p_files) {
 
-	request_instance_scene(p_path);
+	request_instance_scenes(p_files);
 }
 
 void EditorNode::_property_keyed(const String& p_keyed,const Variant& p_value,bool p_advance) {
-- 
cgit v1.2.3-70-g09d2


From a2b8ef6d5108f1822f323e23e8546878e3ec8fe3 Mon Sep 17 00:00:00 2001
From: Johan Manuel
Date: Mon, 25 Jul 2016 15:31:57 +0200
Subject: Fix some warnings

---
 servers/audio/audio_mixer_sw.h | 3 +--
 servers/audio_server.h         | 3 ++-
 tools/editor/editor_node.cpp   | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'tools/editor/editor_node.cpp')

diff --git a/servers/audio/audio_mixer_sw.h b/servers/audio/audio_mixer_sw.h
index 950ed19af..e924b518c 100644
--- a/servers/audio/audio_mixer_sw.h
+++ b/servers/audio/audio_mixer_sw.h
@@ -69,8 +69,7 @@ private:
 		MIX_VOLRAMP_FRAC_MASK=MIX_VOLRAMP_FRAC_LEN-1,
 		MIX_FILTER_FRAC_BITS=16,
 		MIX_FILTER_RAMP_FRAC_BITS=8,
-		MIX_VOL_MOVE_TO_24=4,
-		MAX_REVERBS=4
+		MIX_VOL_MOVE_TO_24=4
 	};
 
 
diff --git a/servers/audio_server.h b/servers/audio_server.h
index 50194af4a..9e21e6b18 100644
--- a/servers/audio_server.h
+++ b/servers/audio_server.h
@@ -65,7 +65,8 @@ public:
 		REVERB_SMALL,
 		REVERB_MEDIUM,
 		REVERB_LARGE,
-		REVERB_HALL
+		REVERB_HALL,
+		MAX_REVERBS
 	};
 
 	virtual ChannelID channel_alloc(RID p_sample)=0;
diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp
index 30b89cacc..2839708f8 100644
--- a/tools/editor/editor_node.cpp
+++ b/tools/editor/editor_node.cpp
@@ -1213,7 +1213,7 @@ void EditorNode::_dialog_action(String p_file) {
 		case FILE_SAVE_SCENE:
 		case FILE_SAVE_AS_SCENE: {
 
-			if (file->get_mode()==FileDialog::MODE_SAVE_FILE) {
+			if (file->get_mode()==EditorFileDialog::MODE_SAVE_FILE) {
 
 				//_save_scene(p_file);
 				_save_scene_with_preview(p_file);
@@ -1223,7 +1223,7 @@ void EditorNode::_dialog_action(String p_file) {
 		} break;
 
 		case FILE_SAVE_AND_RUN: {
-			if (file->get_mode()==FileDialog::MODE_SAVE_FILE) {
+			if (file->get_mode()==EditorFileDialog::MODE_SAVE_FILE) {
 
 				//_save_scene(p_file);
 				_save_scene_with_preview(p_file);
@@ -1448,7 +1448,7 @@ void EditorNode::_dialog_action(String p_file) {
 		} break;
 		default: { //save scene?
 
-			if (file->get_mode()==FileDialog::MODE_SAVE_FILE) {
+			if (file->get_mode()==EditorFileDialog::MODE_SAVE_FILE) {
 
 				//_save_scene(p_file);
 				_save_scene_with_preview(p_file);
-- 
cgit v1.2.3-70-g09d2


From cf851f7ed432134adb1da0077995a3ff26cc404d Mon Sep 17 00:00:00 2001
From: Ignacio Etcheverry
Date: Wed, 27 Jul 2016 18:11:55 +0200
Subject: AboutDialog: Popup respecting its minimum size

---
 tools/editor/editor_node.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tools/editor/editor_node.cpp')

diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp
index 2839708f8..f27a75346 100644
--- a/tools/editor/editor_node.cpp
+++ b/tools/editor/editor_node.cpp
@@ -2842,7 +2842,7 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) {
 		} break;
 		case SETTINGS_ABOUT: {
 
-			about->popup_centered(Size2(500,130)*EDSCALE);
+			about->popup_centered_minsize(Size2(500,130)*EDSCALE);
 		} break;
 		case SOURCES_REIMPORT: {
 
-- 
cgit v1.2.3-70-g09d2