From b0038ae4996993f1dd808babe402e2e390933330 Mon Sep 17 00:00:00 2001 From: Gaia Clary Date: Tue, 12 Jun 2012 23:19:34 +0000 Subject: Collada: fixed a few loops to only loop over the list of exported objects, instead of the current scene. --- source/blender/collada/MaterialExporter.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'source/blender/collada/MaterialExporter.cpp') diff --git a/source/blender/collada/MaterialExporter.cpp b/source/blender/collada/MaterialExporter.cpp index 106861c1916..ef22a76d28e 100644 --- a/source/blender/collada/MaterialExporter.cpp +++ b/source/blender/collada/MaterialExporter.cpp @@ -46,13 +46,11 @@ void MaterialsExporter::exportMaterials(Scene *sce) } } -/* TODO - shouldn't this use the scenes object LinkNode's ? */ bool MaterialsExporter::hasMaterials(Scene *sce) { - Base *base = (Base *)sce->base.first; - - while (base) { - Object *ob = base->object; + LinkNode *node; + for(node=this->export_settings->export_set; node; node = node->next) { + Object *ob = (Object *)node->link; int a; for (a = 0; a < ob->totcol; a++) { Material *ma = give_current_material(ob, a + 1); @@ -62,7 +60,6 @@ bool MaterialsExporter::hasMaterials(Scene *sce) return true; } - base = base->next; } return false; } -- cgit v1.2.3