patch #31794 Collada: make exporter more robust, now uses BKE_object_relational_superset()

1 files changed, 2 insertions, 15 deletions

diff --git a/source/blender/collada/collada_internal.cpp b/source/blender/collada/collada_internal.cpp
index 81e5f88a3f8..06e688a93ac 100644
--- a/source/blender/collada/collada_internal.cpp
+++ b/source/blender/collada/collada_internal.cpp
@@ -27,9 +27,10 @@
 
 /* COLLADABU_ASSERT, may be able to remove later */
 #include "COLLADABUPlatform.h"
-
 #include "collada_internal.h"
 
+#include "BLI_linklist.h"
+
 UnitConverter::UnitConverter() : unit(), up_axis(COLLADAFW::FileInfo::Z_UP) {}
 
 void UnitConverter::read_asset(const COLLADAFW::FileInfo* asset)
@@ -277,17 +278,3 @@ std::string get_material_id(Material *mat)
 {
 	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;
-}