Merge branch 'master' into blender2.8
authorGaia Clary <gaia.clary@machinimatrix.org>
Mon, 26 Feb 2018 22:38:21 +0000 (23:38 +0100)
committerGaia Clary <gaia.clary@machinimatrix.org>
Mon, 26 Feb 2018 22:38:21 +0000 (23:38 +0100)
1  2 
source/blender/collada/AnimationExporter.cpp

index a1497a0ab44e8da0861883d0d56e44a69e3ceebc,54da8b981389374fdfe736ddab20df74895ce547..3e57dafed19a31a5b7c24381d0677fa2dfc8a314
@@@ -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)