summaryrefslogtreecommitdiffstats
path: root/tools/collada/collada.cpp
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2014-06-28 09:50:20 -0300
committerJuan Linietsky <reduzio@gmail.com>2014-06-28 09:50:20 -0300
commit8ffc113b7094c5ba7971aaa65dae4131130acef3 (patch)
treee94474295e25da49a6d6987b01b6cbd0028b068e /tools/collada/collada.cpp
parent2af2a84a03fd707cfa4c682aff34d722343d8985 (diff)
downloadredot-engine-8ffc113b7094c5ba7971aaa65dae4131130acef3.tar.gz
Missing name on collada-imported materials
Diffstat (limited to 'tools/collada/collada.cpp')
-rw-r--r--tools/collada/collada.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/collada/collada.cpp b/tools/collada/collada.cpp
index 0d02c32d00..9962eed1b2 100644
--- a/tools/collada/collada.cpp
+++ b/tools/collada/collada.cpp
@@ -378,6 +378,8 @@ void Collada::_parse_material(XMLParser& parser) {
Material material;
String id=parser.get_attribute_value("id");
+ if (parser.has_attribute("name"))
+ material.name=parser.get_attribute_value("name");
if (state.version<State::Version(1,4,0)) {
/* <1.4 */
@@ -775,9 +777,12 @@ void Collada::_parse_effect(XMLParser& parser) {
String id=parser.get_attribute_value("id");
Effect effect;
+ if (parser.has_attribute("name"))
+ effect.name=parser.get_attribute_value("name");
_parse_effect_material(parser,effect,id);
+
state.effect_map[id]=effect;
COLLADA_PRINT("Effect ID:"+id);