Merge remote-tracking branch 'origin/master' into blender2.8
authorDalai Felinto <dfelinto@gmail.com>
Wed, 8 Nov 2017 20:35:31 +0000 (18:35 -0200)
committerDalai Felinto <dfelinto@gmail.com>
Wed, 8 Nov 2017 20:35:31 +0000 (18:35 -0200)
1  2 
source/blender/collada/DocumentExporter.cpp

index 88bc5c3c295cb3feb0bfeb0f43392225e5103e90,284a6da1a40dd98e8d1ac91bae926615f4ec8f25..ce0c52cdcd1bf94e6835f55a812f186da8b06b87
@@@ -285,13 -287,9 +285,9 @@@ int DocumentExporter::exportCurrentScen
        // <library_geometries>
        if (bc_has_object_type(export_set, OB_MESH)) {
                GeometryExporter ge(writer, this->export_settings);
 -              ge.exportGeom(sce);
 +              ge.exportGeom(eval_ctx, sce);
        }
  
-       // <library_animations>
-       AnimationExporter ae(writer, this->export_settings);
-       bool has_animations = ae.exportAnimations(eval_ctx, sce);
        // <library_controllers>
        ArmatureExporter arm_exporter(writer, this->export_settings);
        ControllerExporter controller_exporter(writer, this->export_settings);
        /* The following code seems to be an obsolete workaround
           Comment out until it proofs correct that we no longer need it.
        */
 -      bool has_animations = ae.exportAnimations(sce);
+       // <library_animations>
+       AnimationExporter ae(writer, this->export_settings);
++      bool has_animations = ae.exportAnimations(eval_ctx, sce);
        if (has_animations && this->export_settings->export_transformation_type == BC_TRANSFORMATION_TYPE_MATRIX) {
                // channels adressing <matrix> objects is not (yet) supported
                // So we force usage of <location>, <translation> and <scale>