diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2017-09-20 20:59:19 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2017-09-20 21:04:20 -0300 |
| commit | 423ca9bcaf4781abd62db47d6f232c279af72429 (patch) | |
| tree | a610ea87af0313129fc27fa1f75f3d422eee697e /editor/collada/collada.cpp | |
| parent | 71e4fae3a1fb8ab684f5366442e5325ebcb99d8d (diff) | |
Fix import order, so scenes are imported after textures.
Also fix bugs when meshes are always generated.
Diffstat (limited to 'editor/collada/collada.cpp')
| -rw-r--r-- | editor/collada/collada.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/editor/collada/collada.cpp b/editor/collada/collada.cpp index 4986d97e8f..2d49840683 100644 --- a/editor/collada/collada.cpp +++ b/editor/collada/collada.cpp @@ -1918,7 +1918,7 @@ void Collada::_parse_animation(XMLParser &parser) { for (int j = 0; j < key_count; j++) { track.keys[j].data.resize(output_len); for (int k = 0; k < output_len; k++) - track.keys[j].data[k] = output[l + j * stride + k]; //super weird but should work + track.keys[j].data[k] = output[l + j * stride + k]; //super weird but should work: } if (sampler.has("INTERPOLATION")) { |