Merging from trunk up to r38119.

1 files changed, 5 insertions, 4 deletions

diff --git a/source/blender/collada/CameraExporter.cpp b/source/blender/collada/CameraExporter.cpp
index 9d09f170776..e3feab6b76c 100644
--- a/source/blender/collada/CameraExporter.cpp
+++ b/source/blender/collada/CameraExporter.cpp
@@ -42,24 +42,25 @@
 CamerasExporter::CamerasExporter(COLLADASW::StreamWriter *sw): COLLADASW::LibraryCameras(sw){}
 
 template<class Functor>
-void forEachCameraObjectInScene(Scene *sce, Functor &f)
+void forEachCameraObjectInScene(Scene *sce, Functor &f, bool export_selected)
 {
 	Base *base= (Base*) sce->base.first;
 	while(base) {
 		Object *ob = base->object;
 			
-		if (ob->type == OB_CAMERA && ob->data) {
+		if (ob->type == OB_CAMERA && ob->data
+			&& !(export_selected && !(ob->flag & SELECT))) {
 			f(ob, sce);
 		}
 		base= base->next;
 	}
 }
 
-void CamerasExporter::exportCameras(Scene *sce)
+void CamerasExporter::exportCameras(Scene *sce, bool export_selected)
 {
 	openLibrary();
 	
-	forEachCameraObjectInScene(sce, *this);
+	forEachCameraObjectInScene(sce, *this, export_selected);
 	
 	closeLibrary();
 }