summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2017-11-19 21:35:22 +0100
committerGitHub <noreply@github.com>2017-11-19 21:35:22 +0100
commit39204630a7165ecda15228d7b5210e1634e6bcf9 (patch)
tree78c118144e6a6616fe617090882027b737d8def5
parent1552dbfb21f005ae7f747b8867f9da553b678b77 (diff)
parent5e56366eba53a8ccfc4de48f0d0aa78a4cb1bc98 (diff)
Merge pull request #13052 from djrm/pr_fixes
Fix import obj as scene.
-rw-r--r--editor/import/resource_importer_obj.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/editor/import/resource_importer_obj.cpp b/editor/import/resource_importer_obj.cpp
index 4541c77085..bd24aac99b 100644
--- a/editor/import/resource_importer_obj.cpp
+++ b/editor/import/resource_importer_obj.cpp
@@ -413,6 +413,7 @@ Node *EditorOBJImporter::import_scene(const String &p_path, uint32_t p_flags, in
for (List<Ref<Mesh> >::Element *E = meshes.front(); E; E = E->next()) {
MeshInstance *mi = memnew(MeshInstance);
+ mi->set_mesh(E->get());
mi->set_name(E->get()->get_name());
scene->add_child(mi);
mi->set_owner(scene);