blender
/
blender
128
395
Fork 567
Code Issues 6.2k Pull Requests 751 Projects 19 Wiki Activity

Merge branch 'master' into blender2.8

This commit is contained in:
Gaia Clary 2018-02-26 23:38:21 +01:00
parent edcd30f6ab b5f0e8e1a1
commit e24906759f
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/collada/AnimationExporter.cpp
View File

@ -219,6 +219,7 @@ void AnimationExporter::export_sampled_matrix_animation(Object *ob, std::vector<
bc_update_scene(eval_ctx, scene, *ctime);
BKE_object_matrix_local_get(ob, fmat);
converter.mat4_to_dae(outmat, fmat);
if (this->export_settings->limit_precision)
@ -284,8 +285,8 @@ void AnimationExporter::export_sampled_transrotloc_animation(Object *ob, std::ve
create_sampled_animation(1, ctimes, baked_curves[EULY], ob_name, "rotation", "Y", true);
create_sampled_animation(1, ctimes, baked_curves[EULZ], ob_name, "rotation", "Z", true);
fprintf(stdout, "Animation Export: Baked %zd frames for %s (sampling rate: %d)\n",
baked_curves[0].size(),
fprintf(stdout, "Animation Export: Baked %d frames for %s (sampling rate: %d)\n",
(int)baked_curves[0].size(),
ob->id.name,
this->export_settings->sampling_rate);
}
@ -1261,10 +1262,6 @@ std::string AnimationExporter::create_4x4_source(std::vector<float> &ctimes, std
source.prepareToAppendValues();
bPoseChannel *parchan = NULL;
bPoseChannel *pchan = NULL;
std::vector<float>::iterator it;
for (it = values.begin(); it != values.end(); it+=16) {