[Bf-blender-cvs] [e24906759f7] blender2.8: Merge branch 'master' into blender2.8
Gaia Clary
noreply at git.blender.org
Mon Feb 26 23:38:40 CET 2018
Commit: e24906759f7b181efc568c3ddb9afffa8dfe965c
Author: Gaia Clary
Date: Mon Feb 26 23:38:21 2018 +0100
Branches: blender2.8
https://developer.blender.org/rBe24906759f7b181efc568c3ddb9afffa8dfe965c
Merge branch 'master' into blender2.8
===================================================================
===================================================================
diff --cc source/blender/collada/AnimationExporter.cpp
index a1497a0ab44,54da8b98138..3e57dafed19
--- a/source/blender/collada/AnimationExporter.cpp
+++ b/source/blender/collada/AnimationExporter.cpp
@@@ -217,8 -216,9 +217,9 @@@ void AnimationExporter::export_sampled_
float fmat[4][4];
float outmat[4][4];
- bc_update_scene(scene, *ctime);
+ 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)
More information about the Bf-blender-cvs
mailing list