summaryrefslogtreecommitdiff
path: root/tools/editor
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2016-06-08 07:53:19 -0300
committerJuan Linietsky <reduzio@gmail.com>2016-06-08 07:53:19 -0300
commit732e5be3fff2883feb4f1434bec953f936e7c9e7 (patch)
tree4e74791dbb62f07530bd4125feb39c1ab6e3a8c5 /tools/editor
parentac4fdb391e50e3ba4d30fc5ab6f09114dc32d8c2 (diff)
parent101e0c9ec6db92a842a8ca8fc7b4e475a6f2f477 (diff)
Merge pull request #5094 from pkowal1982/master
Improved Blender/Collada shadeless->unshaded import
Diffstat (limited to 'tools/editor')
-rw-r--r--tools/editor/io_plugins/editor_import_collada.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/editor/io_plugins/editor_import_collada.cpp b/tools/editor/io_plugins/editor_import_collada.cpp
index f0aec113d1..80cd54756e 100644
--- a/tools/editor/io_plugins/editor_import_collada.cpp
+++ b/tools/editor/io_plugins/editor_import_collada.cpp
@@ -467,6 +467,7 @@ Error ColladaImport::_create_material(const String& p_target) {
material->set_parameter(FixedMaterial::PARAM_SPECULAR_EXP,effect.shininess);
material->set_flag(Material::FLAG_DOUBLE_SIDED,effect.double_sided);
+ material->set_flag(Material::FLAG_UNSHADED,effect.unshaded);