diff options
Diffstat (limited to 'source/blender/collada/DocumentExporter.cpp')
| -rw-r--r-- | source/blender/collada/DocumentExporter.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/collada/DocumentExporter.cpp b/source/blender/collada/DocumentExporter.cpp index 2e5d1757c4c..9e78c164dad 100644 --- a/source/blender/collada/DocumentExporter.cpp +++ b/source/blender/collada/DocumentExporter.cpp @@ -62,7 +62,7 @@ #include "COLLADASWInstanceNode.h" #include "COLLADASWBaseInputElement.h" -extern "C" +extern "C" { #include "DNA_scene_types.h" #include "DNA_object_types.h" @@ -257,14 +257,14 @@ int DocumentExporter::exportCurrentScene(bContext *C, Scene *sce) #endif asset.getContributor().mAuthoringTool = version_buf; asset.add(); - + LinkNode *export_set = this->export_settings->export_set; // <library_cameras> if (bc_has_object_type(export_set, OB_CAMERA)) { CamerasExporter ce(writer, this->export_settings); ce.exportCameras(sce); } - + // <library_lights> if (bc_has_object_type(export_set, OB_LAMP)) { LightsExporter le(writer, this->export_settings); @@ -274,11 +274,11 @@ int DocumentExporter::exportCurrentScene(bContext *C, Scene *sce) // <library_images> ImagesExporter ie(writer, this->export_settings); ie.exportImages(sce); - + // <library_effects> EffectsExporter ee(writer, this->export_settings); ee.exportEffects(sce); - + // <library_materials> MaterialsExporter me(writer, this->export_settings); me.exportMaterials(sce); @@ -292,7 +292,7 @@ int DocumentExporter::exportCurrentScene(bContext *C, Scene *sce) // <library_controllers> ArmatureExporter arm_exporter(writer, this->export_settings); ControllerExporter controller_exporter(writer, this->export_settings); - if (bc_has_object_type(export_set, OB_ARMATURE) || this->export_settings->include_shapekeys) + if (bc_has_object_type(export_set, OB_ARMATURE) || this->export_settings->include_shapekeys) { controller_exporter.export_controllers(depsgraph, sce); } @@ -307,13 +307,13 @@ int DocumentExporter::exportCurrentScene(bContext *C, Scene *sce) ae.exportAnimations(sce); } se.exportScene(C, depsgraph, sce); - + // <scene> std::string scene_name(translate_id(id_name(sce))); COLLADASW::Scene scene(writer, COLLADASW::URI(COLLADABU::Utils::EMPTY_STRING, scene_name)); scene.add(); - + // close <Collada> writer->endDocument(); delete writer; |