diff options
| author | Arystanbek Dyussenov <arystan.d@gmail.com> | 2009-11-04 18:25:57 +0300 |
|---|---|---|
| committer | Arystanbek Dyussenov <arystan.d@gmail.com> | 2009-11-04 18:25:57 +0300 |
| commit | b36c4f39878eb90788c8d9bdda74ccd6eebcf41b (patch) | |
| tree | f866e65e38821b3cb64e39c39de0b022f7b38382 /source/blender/collada/DocumentExporter.cpp | |
| parent | 3ac98f1abd2f22acf3128b9564c4309b4b129ef9 (diff) | |
Merging change 24311 from COLLADA branch into trunk which should fix object-based rotation import/export. Bone rotation animation not fixed yet.
Diffstat (limited to 'source/blender/collada/DocumentExporter.cpp')
| -rw-r--r-- | source/blender/collada/DocumentExporter.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/collada/DocumentExporter.cpp b/source/blender/collada/DocumentExporter.cpp index 09db4ba062f..b10a95e6418 100644 --- a/source/blender/collada/DocumentExporter.cpp +++ b/source/blender/collada/DocumentExporter.cpp @@ -1832,7 +1832,7 @@ public: std::string new_rna_path; if (strstr(rna_path, "rotation")) { - new_rna_path = strstr(rna_path, "rotation"); + new_rna_path = "rotation"; return new_rna_path + axis_name; } else if (strstr(rna_path, "location")) { @@ -2058,7 +2058,7 @@ public: if (!strcmp(fcu->rna_path, "location") || !strcmp(fcu->rna_path, "scale") || - !strcmp(fcu->rna_path, "rotation")) { + !strcmp(fcu->rna_path, "rotation_euler")) { add_animation(fcu, id_name(ob)); } |