Merging r39998 through r40043 from trunk into soc-2011-tomato
[blender-staging.git] / source / blender / collada / CameraExporter.cpp
index 8de7fb440f3dd719c01fe9e22fa1d787f208419d..520650bc82efc4903bdf684763f1b4c19f6122dc 100644 (file)
@@ -39,7 +39,7 @@
 
 #include "collada_internal.h"
 
-CamerasExporter::CamerasExporter(COLLADASW::StreamWriter *sw): COLLADASW::LibraryCameras(sw){}
+CamerasExporter::CamerasExporter(COLLADASW::StreamWriter *sw, const ExportSettings *export_settings): COLLADASW::LibraryCameras(sw), export_settings(export_settings) {}
 
 template<class Functor>
 void forEachCameraObjectInScene(Scene *sce, Functor &f, bool export_selected)
@@ -56,11 +56,11 @@ void forEachCameraObjectInScene(Scene *sce, Functor &f, bool export_selected)
        }
 }
 
-void CamerasExporter::exportCameras(Scene *sce, bool export_selected)
+void CamerasExporter::exportCameras(Scene *sce)
 {
        openLibrary();
        
-       forEachCameraObjectInScene(sce, *this, export_selected);
+       forEachCameraObjectInScene(sce, *this, this->export_settings->selected);
        
        closeLibrary();
 }