From 9738ebcda047fd9b4ddf71a0da5d682ade1a2666 Mon Sep 17 00:00:00 2001
From: Juan Linietsky
Date: Sat, 25 Nov 2017 12:32:02 -0300
Subject: -Fixed height fog (was broken) -Make sure materials are named in OBJ
 importer, so they can be saved outside as resources.

---
 editor/import/resource_importer_obj.cpp   | 1 +
 editor/import/resource_importer_scene.cpp | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'editor/import')

diff --git a/editor/import/resource_importer_obj.cpp b/editor/import/resource_importer_obj.cpp
index bd24aac99..14bda9bb4 100644
--- a/editor/import/resource_importer_obj.cpp
+++ b/editor/import/resource_importer_obj.cpp
@@ -58,6 +58,7 @@ static Error _parse_material_library(const String &p_path, Map<String, Ref<Spati
 
 			current_name = l.replace("newmtl", "").strip_edges();
 			current.instance();
+			current->set_name(current_name);
 			material_map[current_name] = current;
 		} else if (l.begins_with("Ka ")) {
 			//uv
diff --git a/editor/import/resource_importer_scene.cpp b/editor/import/resource_importer_scene.cpp
index af766128b..95445693b 100644
--- a/editor/import/resource_importer_scene.cpp
+++ b/editor/import/resource_importer_scene.cpp
@@ -952,7 +952,10 @@ void ResourceImporterScene::_make_external_resources(Node *p_node, const String
 
 							for (int i = 0; i < mesh->get_surface_count(); i++) {
 								mat = mesh->surface_get_material(i);
-								if (!mat.is_valid() || mat->get_name() == "")
+
+								if (!mat.is_valid())
+									continue;
+								if (mat->get_name() == "")
 									continue;
 
 								if (!p_materials.has(mat)) {
-- 
cgit v1.2.3-70-g09d2