From c97c733779e4061313ea57804f24f646c3b1228c Mon Sep 17 00:00:00 2001
From: Jon Ross <jonross.zlsa+gitlab@gmail.com>
Date: Fri, 19 May 2017 14:49:37 -0700
Subject: [PATCH] Fix #8819. Adds _import_node() that, when used in conjunction
 with _import_scene, recurses through the scene tree and exports all available
 nodes.

---
 editor/plugins/tile_set_editor_plugin.cpp | 26 ++++++++++++-----------
 editor/plugins/tile_set_editor_plugin.h   |  1 +
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/editor/plugins/tile_set_editor_plugin.cpp b/editor/plugins/tile_set_editor_plugin.cpp
index e79cbd0d35b..0b088f71711 100644
--- a/editor/plugins/tile_set_editor_plugin.cpp
+++ b/editor/plugins/tile_set_editor_plugin.cpp
@@ -37,24 +37,18 @@ void TileSetEditor::edit(const Ref<TileSet> &p_tileset) {
 	tileset = p_tileset;
 }
 
-void TileSetEditor::_import_scene(Node *scene, Ref<TileSet> p_library, bool p_merge) {
+void TileSetEditor::_import_node(Node *p_node, Ref<TileSet> p_library) {
 
-	if (!p_merge)
-		p_library->clear();
+	for (int i = 0; i < p_node->get_child_count(); i++) {
 
-	for (int i = 0; i < scene->get_child_count(); i++) {
-
-		Node *child = scene->get_child(i);
+		Node *child = p_node->get_child(i);
 
 		if (!child->cast_to<Sprite>()) {
 			if (child->get_child_count() > 0) {
-				child = child->get_child(0);
-				if (!child->cast_to<Sprite>()) {
-					continue;
-				}
+				_import_node(child, p_library);
+			}
 
-			} else
-				continue;
+			continue;
 		}
 
 		Sprite *mi = child->cast_to<Sprite>();
@@ -138,6 +132,14 @@ void TileSetEditor::_import_scene(Node *scene, Ref<TileSet> p_library, bool p_me
 	}
 }
 
+void TileSetEditor::_import_scene(Node *scene, Ref<TileSet> p_library, bool p_merge) {
+
+	if (!p_merge)
+		p_library->clear();
+
+	_import_node(scene, p_library);
+}
+
 void TileSetEditor::_menu_confirm() {
 
 	switch (option) {
diff --git a/editor/plugins/tile_set_editor_plugin.h b/editor/plugins/tile_set_editor_plugin.h
index 42084c05a39..d04ebc71975 100644
--- a/editor/plugins/tile_set_editor_plugin.h
+++ b/editor/plugins/tile_set_editor_plugin.h
@@ -59,6 +59,7 @@ class TileSetEditor : public Control {
 	void _menu_confirm();
 	void _name_dialog_confirm(const String &name);
 
+	static void _import_node(Node *p_node, Ref<TileSet> p_library);
 	static void _import_scene(Node *p_scene, Ref<TileSet> p_library, bool p_merge);
 
 protected: