diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-11-25 00:01:30 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-11-25 00:01:53 +0300 |
| commit | 059c119719e04283808d3c7076886e1a58874f6b (patch) | |
| tree | 5296776b81111ef62e33687d4a9b4c6ab5e297ff /source/blender/collada/AnimationExporter.cpp | |
| parent | fa0fcbe4d6ca3f183f02395fe9ba18fb5ea87748 (diff) | |
| parent | e742e0934de6384eeaf271ca4cfe99922ddbe3fb (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/collada/AnimationExporter.cpp')
| -rw-r--r-- | source/blender/collada/AnimationExporter.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/collada/AnimationExporter.cpp b/source/blender/collada/AnimationExporter.cpp index 4491b7412a6..69a25ac7a82 100644 --- a/source/blender/collada/AnimationExporter.cpp +++ b/source/blender/collada/AnimationExporter.cpp @@ -125,7 +125,7 @@ bool AnimationExporter::exportAnimations() /* TODO: If all actions shall be exported, we need to call the * AnimationClipExporter which will figure out which actions * need to be exported for which objects - */ + */ if (this->export_settings->include_all_actions) { AnimationClipExporter ace(eval_ctx, sw, export_settings, anim_meta); ace.exportAnimationClips(sce); @@ -247,7 +247,7 @@ void AnimationExporter::export_bone_animations_recursive(Object *ob, Bone *bone, { std::vector<float> frames; sampler.get_bone_frames(frames, ob, bone); - + if (frames.size()) { BCMatrixSampleMap samples; bool is_animated = sampler.get_bone_samples(samples, ob, bone); @@ -478,8 +478,8 @@ std::string AnimationExporter::get_semantic_suffix(COLLADASW::InputSemantic::Sem void AnimationExporter::add_source_parameters(COLLADASW::SourceBase::ParameterNameList& param, COLLADASW::InputSemantic::Semantics semantic, - bool is_rot, - const std::string axis, + bool is_rot, + const std::string axis, bool transform) { switch (semantic) { @@ -633,7 +633,7 @@ std::string AnimationExporter::collada_source_from_values(BCMatrixSampleMap &sam } std::string AnimationExporter::collada_interpolation_source(const BCAnimationCurve &curve, - const std::string& anim_id, + const std::string& anim_id, const std::string axis, bool *has_tangents) { |