8 files changed, 33 insertions, 17 deletions
diff --git a/tools/editor/animation_editor.cpp b/tools/editor/animation_editor.cpp
index cdce910665..a247543830 100644
--- a/tools/editor/animation_editor.cpp
+++ b/tools/editor/animation_editor.cpp
@@ -3022,9 +3022,14 @@ Node *AnimationKeyEditor::get_root() const {
 
 
 
-void AnimationKeyEditor::set_keying(bool p_enabled) {
+void AnimationKeyEditor::update_keying() {
 
-	keying=p_enabled;
+	bool keying_enabled=is_visible() && animation.is_valid();
+
+	if (keying_enabled==keying)
+		return;
+
+	keying=keying_enabled;
 	_update_menu();
 	emit_signal("keying_changed");
 
@@ -3032,7 +3037,7 @@ void AnimationKeyEditor::set_keying(bool p_enabled) {
 
 bool AnimationKeyEditor::has_keying() const {
 
-	return is_visible() && animation.is_valid();
+	return keying;
 }
 
 void AnimationKeyEditor::_query_insert(const InsertData& p_id) {
diff --git a/tools/editor/animation_editor.h b/tools/editor/animation_editor.h
index c8a539179e..5e81439fe6 100644
--- a/tools/editor/animation_editor.h
+++ b/tools/editor/animation_editor.h
@@ -324,7 +324,7 @@ public:
 	Ref<Animation> get_current_animation() const;
 	void set_root(Node *p_root);
 	Node *get_root() const;
-	void set_keying(bool p_enabled);
+	void update_keying();
 	bool has_keying() const;
 
 	void cleanup();
diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp
index 79f5e66401..1abcb8f604 100644
--- a/tools/editor/editor_node.cpp
+++ b/tools/editor/editor_node.cpp
@@ -2214,7 +2214,7 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) {
 
 		case FILE_EXPORT_PROJECT: {
 
-			project_export_settings->popup_centered_ratio();
+			project_export_settings->popup_export();
 			/*
 			String target = export_db->get_current_platform();
 			Ref<EditorExporter> exporter = export_db->get_exporter(target);
@@ -3661,6 +3661,7 @@ void EditorNode::update_keying() {
 
 	property_editor->set_keying(valid);
 
+	AnimationPlayerEditor::singleton->get_key_editor()->update_keying();
 }
 
 
diff --git a/tools/editor/plugins/animation_player_editor_plugin.cpp b/tools/editor/plugins/animation_player_editor_plugin.cpp
index 43b4276d45..0e2977c5a1 100644
--- a/tools/editor/plugins/animation_player_editor_plugin.cpp
+++ b/tools/editor/plugins/animation_player_editor_plugin.cpp
@@ -128,16 +128,9 @@ void AnimationPlayerEditor::_notification(int p_what) {
 		anim_editor_load->set_hover_texture( get_icon("AnimGetHl","EditorIcons"));
 		anim_editor_store->set_hover_texture( get_icon("AnimSetHl","EditorIcons"));
 */
-	}
-
-	if (p_what==NOTIFICATION_READY) {
 
 		get_tree()->connect("node_removed",this,"_node_removed");
 	}
-
-	if (p_what==NOTIFICATION_DRAW) {
-
-	}
 }
 
 void AnimationPlayerEditor::_autoplay_pressed() {
diff --git a/tools/editor/plugins/script_editor_plugin.cpp b/tools/editor/plugins/script_editor_plugin.cpp
index 34d7e89760..e6e90eb0db 100644
--- a/tools/editor/plugins/script_editor_plugin.cpp
+++ b/tools/editor/plugins/script_editor_plugin.cpp
@@ -1694,7 +1694,7 @@ void ScriptEditor::ensure_select_current() {
 
 			Ref<Script> script = ste->get_edited_script();
 
-			if (!grab_focus_block && is_inside_tree())
+			if (!grab_focus_block && is_visible())
 				ste->get_text_edit()->grab_focus();
 
 			edit_menu->show();
diff --git a/tools/editor/project_export.cpp b/tools/editor/project_export.cpp
index 7690d31e7b..164443d001 100644
--- a/tools/editor/project_export.cpp
+++ b/tools/editor/project_export.cpp
@@ -122,6 +122,15 @@ void ProjectExportDialog::_tree_changed() {
 
 }
 
+void ProjectExportDialog::popup_export() {
+	popup_centered_ratio();
+	if (pending_update_tree) {
+		_update_tree();
+		_update_group_tree();
+		pending_update_tree=false;
+	}
+}
+
 void ProjectExportDialog::_update_tree() {
 
 
@@ -168,6 +177,11 @@ void ProjectExportDialog::_scan_finished() {
 	print_line("**********SCAN DONEEE********");
 	print_line("**********SCAN DONEEE********");*/
 
+	if (!is_visible()) {
+		pending_update_tree=true;
+		return;
+	}
+
 	_update_tree();
 	_update_group_tree();
 }
@@ -1446,7 +1460,7 @@ ProjectExportDialog::ProjectExportDialog(EditorNode *p_editor) {
 
 	ei="EditorIcons";
 	ot="Object";
-
+	pending_update_tree=true;
 }
 
 
@@ -1480,6 +1494,8 @@ void ProjectExport::popup_export() {
 
 	popup_centered(Size2(300,100));
 
+
+
 }
 Error ProjectExport::export_project(const String& p_preset) {
 
@@ -1880,5 +1896,6 @@ ProjectExport::ProjectExport(EditorData* p_data) {
 	error = memnew( AcceptDialog );
 	add_child(error);
 
+
 }
 
diff --git a/tools/editor/project_export.h b/tools/editor/project_export.h
index 5a42a58e58..b9e49489e3 100644
--- a/tools/editor/project_export.h
+++ b/tools/editor/project_export.h
@@ -70,6 +70,7 @@ private:
 
 	TabContainer *sections;
 	bool updating_tree;
+	bool pending_update_tree;
 	AcceptDialog *error;
 	ConfirmationDialog *confirm;
 
@@ -203,6 +204,7 @@ public:
 
 	Error export_platform(const String& p_platform, const String& p_path, bool p_debug,const String& p_password,bool p_quit_after=false);
 
+	void popup_export();
 	ProjectExportDialog(EditorNode *p_editor);
 	~ProjectExportDialog();
 };
diff --git a/tools/editor/property_editor.cpp b/tools/editor/property_editor.cpp
index 4b1b93ea6e..3dfc461bfe 100644
--- a/tools/editor/property_editor.cpp
+++ b/tools/editor/property_editor.cpp
@@ -3701,9 +3701,7 @@ PropertyEditor::PropertyEditor() {
 
 	capitalize_paths=true;
 	autoclear=false;
-	tree->set_column_title(0,"Property");
-	tree->set_column_title(1,"Value");
-	tree->set_column_titles_visible(true);
+	tree->set_column_titles_visible(false);
 
 	keying=false;
 	read_only=false;