[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35596] trunk/blender/source/blender/ collada: COLLADA: Don't write empty libraries for geometry, lights, cameras , controllers

[Nathan Letwory]

Revision: 35596
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35596
Author:   jesterking
Date:     2011-03-17 16:40:53 +0000 (Thu, 17 Mar 2011)
Log Message:
-----------
COLLADA: Don't write empty libraries for geometry, lights, cameras, controllers

Modified Paths:
--------------
    trunk/blender/source/blender/collada/DocumentExporter.cpp
    trunk/blender/source/blender/collada/collada_internal.cpp
    trunk/blender/source/blender/collada/collada_internal.h

Modified: trunk/blender/source/blender/collada/DocumentExporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/DocumentExporter.cpp	2011-03-17 14:52:01 UTC (rev 35595)
+++ trunk/blender/source/blender/collada/DocumentExporter.cpp	2011-03-17 16:40:53 UTC (rev 35596)
@@ -987,12 +987,16 @@
 	asset.add();
 	
 	// <library_cameras>
-	CamerasExporter ce(&sw);
-	ce.exportCameras(sce);
+	if(has_object_type(sce, OB_CAMERA)) {
+		CamerasExporter ce(&sw);
+		ce.exportCameras(sce);
+	}
 	
 	// <library_lights>
-	LightsExporter le(&sw);
-	le.exportLights(sce);
+	if(has_object_type(sce, OB_LAMP)) {
+		LightsExporter le(&sw);
+		le.exportLights(sce);
+	}
 
 	// <library_images>
 	ImagesExporter ie(&sw, filename);
@@ -1007,8 +1011,10 @@
 	me.exportMaterials(sce);
 
 	// <library_geometries>
-	GeometryExporter ge(&sw);
-	ge.exportGeom(sce);
+	if(has_object_type(sce, OB_MESH)) {
+		GeometryExporter ge(&sw);
+		ge.exportGeom(sce);
+	}
 
 	// <library_animations>
 	AnimationExporter ae(&sw);
@@ -1016,7 +1022,9 @@
 
 	// <library_controllers>
 	ArmatureExporter arm_exporter(&sw);
-	arm_exporter.export_controllers(sce);
+	if(has_object_type(sce, OB_ARMATURE)) {
+		arm_exporter.export_controllers(sce);
+	}
 
 	// <library_visual_scenes>
 	SceneExporter se(&sw, &arm_exporter);

Modified: trunk/blender/source/blender/collada/collada_internal.cpp
===================================================================
--- trunk/blender/source/blender/collada/collada_internal.cpp	2011-03-17 14:52:01 UTC (rev 35595)
+++ trunk/blender/source/blender/collada/collada_internal.cpp	2011-03-17 16:40:53 UTC (rev 35596)
@@ -277,3 +277,17 @@
 {
 	return translate_id(id_name(mat)) + "-material";
 }
+
+bool has_object_type(Scene *sce, short obtype)
+{
+	Base *base= (Base*) sce->base.first;
+	while(base) {
+		Object *ob = base->object;
+			
+		if (ob->type == obtype && ob->data) {
+			return true;
+		}
+		base= base->next;
+	}
+	return false;
+}

Modified: trunk/blender/source/blender/collada/collada_internal.h
===================================================================
--- trunk/blender/source/blender/collada/collada_internal.h	2011-03-17 14:52:01 UTC (rev 35595)
+++ trunk/blender/source/blender/collada/collada_internal.h	2011-03-17 16:40:53 UTC (rev 35596)
@@ -39,6 +39,7 @@
 #include "DNA_armature_types.h"
 #include "DNA_material_types.h"
 #include "DNA_object_types.h"
+#include "DNA_scene_types.h"
 #include "BLI_math.h"
 
 class UnitConverter
@@ -97,4 +98,6 @@
 
 extern std::string get_material_id(Material *mat);
 
+extern bool has_object_type(Scene* sce, short obtype);
+
 #endif /* COLLADA_INTERNAL_H */