diff options
| author | Arystanbek Dyussenov <arystan.d@gmail.com> | 2009-11-29 22:16:52 +0300 |
|---|---|---|
| committer | Arystanbek Dyussenov <arystan.d@gmail.com> | 2009-11-29 22:16:52 +0300 |
| commit | 92b4316708bad0448f4c433ef9c6c2d3cc1f4fb5 (patch) | |
| tree | 5b00bbd7dd2f8d08affce8ad7d5688f5b786cde4 /source/blender/collada/DocumentExporter.cpp | |
| parent | edf32a6fb0213bf35748890dfbc84b20d384298e (diff) | |
Merge from COLLADA branch into trunk of -c 24572 (cmake and scons for OpenCollada @ 675, Linux) and 25001 (bone animation import). See corresponding log entries for more detail.
Diffstat (limited to 'source/blender/collada/DocumentExporter.cpp')
| -rw-r--r-- | source/blender/collada/DocumentExporter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/collada/DocumentExporter.cpp b/source/blender/collada/DocumentExporter.cpp index fac7b2c882a..c3550dfd408 100644 --- a/source/blender/collada/DocumentExporter.cpp +++ b/source/blender/collada/DocumentExporter.cpp @@ -673,7 +673,7 @@ protected: copy_m4_m4(local, mat); } - TransformBase::decompose(local, loc, rot, size); + TransformBase::decompose(local, loc, rot, NULL, size); /* // this code used to create a single <rotate> representing object rotation |