diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2014-10-27 22:54:32 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2014-10-27 22:54:32 -0300 |
| commit | e82dc402052a47b44bb3bcf50ee4801257f92778 (patch) | |
| tree | 01c2cd8692b5569cae778f6504b76b3d1f9ccdad /tools/collada/collada.cpp | |
| parent | 9608d4255eb6c76b1c4496f4494c829133e096f4 (diff) | |
| download | redot-engine-e82dc402052a47b44bb3bcf50ee4801257f92778.tar.gz | |
-Much improvement to baked light baker
-Fixed many bugs in stretch mode
-Fixes to camera project and unproject as consequence of the above
-added setget to script (documented in script doc)
-more fixes to collada exporter for blender
Diffstat (limited to 'tools/collada/collada.cpp')
| -rw-r--r-- | tools/collada/collada.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/collada/collada.cpp b/tools/collada/collada.cpp index 7f4f92e82d..7a842391a4 100644 --- a/tools/collada/collada.cpp +++ b/tools/collada/collada.cpp @@ -2106,6 +2106,8 @@ void Collada::_parse_animation_clip(XMLParser& parser) { if (parser.has_attribute("name")) clip.name=parser.get_attribute_value("name"); + else if (parser.has_attribute("id")) + clip.name=parser.get_attribute_value("id"); if (parser.has_attribute("start")) clip.begin=parser.get_attribute_value("start").to_double(); if (parser.has_attribute("end")) |