Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #9754 from Hinsbart/obj_fix

Browse source 
OBJ Importer: Fix relative path materials.
This commit is contained in:
Rémi Verschelde 2017-07-22 13:49:19 +02:00 • committed by GitHub
commit 8495acc510
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
editor/import/resource_importer_obj.cpp
View file

@ -395,6 +395,10 @@ Node *EditorOBJImporter::import_scene(const String &p_path, uint32_t p_flags, in
if (!material_map.has(current_material_library)) {
Map<String, Ref<SpatialMaterial> > lib;
Error err = _parse_material_library(current_material_library, lib, r_missing_deps);
if (err == ERR_CANT_OPEN) {
String dir = p_path.get_base_dir();
err = _parse_material_library(dir.plus_file(current_material_library), lib, r_missing_deps);
}
if (err == OK) {
material_map[current_material_library] = lib;
}