diff options
Diffstat (limited to 'source/blender/collada/ImageExporter.cpp')
| -rw-r--r-- | source/blender/collada/ImageExporter.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/collada/ImageExporter.cpp b/source/blender/collada/ImageExporter.cpp index 4d7c56ab419..c777a7d1fab 100644 --- a/source/blender/collada/ImageExporter.cpp +++ b/source/blender/collada/ImageExporter.cpp @@ -42,17 +42,18 @@ #include "BLI_string.h" ImagesExporter::ImagesExporter(COLLADASW::StreamWriter *sw, const ExportSettings *export_settings) : COLLADASW::LibraryImages(sw), export_settings(export_settings) -{} +{ +} bool ImagesExporter::hasImages(Scene *sce) { - Base *base = (Base *)sce->base.first; + LinkNode *node; - while (base) { - Object *ob= base->object; + 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); + Material *ma = give_current_material(ob, a + 1); // no material, but check all of the slots if (!ma) continue; @@ -63,7 +64,6 @@ bool ImagesExporter::hasImages(Scene *sce) } } - base= base->next; } return false; } @@ -73,7 +73,7 @@ void ImagesExporter::exportImages(Scene *sce) if (hasImages(sce)) { openLibrary(); MaterialFunctor mf; - mf.forEachMaterialInScene<ImagesExporter>(sce, *this, this->export_settings->selected); + mf.forEachMaterialInExportSet<ImagesExporter>(sce, *this, this->export_settings->export_set); closeLibrary(); } |