1 files changed, 27 insertions, 51 deletions

diff --git a/source/blender/collada/EffectExporter.cpp b/source/blender/collada/EffectExporter.cpp
index 2bf0859b0f0..5e7f92047d3 100644
--- a/source/blender/collada/EffectExporter.cpp
+++ b/source/blender/collada/EffectExporter.cpp
@@ -27,6 +27,7 @@
 
 
 #include <map>
+#include <set>
 
 #include "COLLADASWEffectProfile.h"
 #include "COLLADAFWColorOrTexture.h"
@@ -43,21 +44,31 @@ extern "C" {
 	#include "DNA_texture_types.h"
 	#include "DNA_world_types.h"
 
+	#include "BKE_collection.h"
 	#include "BKE_customdata.h"
 	#include "BKE_mesh.h"
 	#include "BKE_material.h"
 }
 
-EffectsExporter::EffectsExporter(COLLADASW::StreamWriter *sw, const ExportSettings *export_settings) : COLLADASW::LibraryEffects(sw), export_settings(export_settings) {
+// OB_MESH is assumed
+static std::string getActiveUVLayerName(Object *ob)
+{
+	Mesh *me = (Mesh *)ob->data;
+
+	int num_layers = CustomData_number_of_layers(&me->fdata, CD_MTFACE);
+	if (num_layers)
+		return std::string(bc_CustomData_get_active_layer_name(&me->fdata, CD_MTFACE));
+		
+	return "";
 }
 
+EffectsExporter::EffectsExporter(COLLADASW::StreamWriter *sw, const ExportSettings *export_settings) : COLLADASW::LibraryEffects(sw), export_settings(export_settings) {
+}
 
 bool EffectsExporter::hasEffects(Scene *sce)
 {
-	Base *base = (Base *)sce->base.first;
-	
-	while (base) {
-		Object *ob = base->object;
+	FOREACH_SCENE_OBJECT(sce, ob)
+	{
 		int a;
 		for (a = 0; a < ob->totcol; a++) {
 			Material *ma = give_current_material(ob, a + 1);
@@ -67,56 +78,20 @@ bool EffectsExporter::hasEffects(Scene *sce)
 
 			return true;
 		}
-		base = base->next;
 	}
+	FOREACH_SCENE_OBJECT_END
 	return false;
 }
 
 void EffectsExporter::exportEffects(Scene *sce)
 {
-	this->scene = sce;
-	
-	if (this->export_settings->export_texture_type == BC_TEXTURE_TYPE_MAT) {
-		if (hasEffects(sce)) {
-				MaterialFunctor mf;
-				openLibrary();
-				mf.forEachMaterialInExportSet<EffectsExporter>(sce, *this, this->export_settings->export_set);
-				closeLibrary();
-		}
-	}
-	else {
-		std::set<Object *> uv_textured_obs = bc_getUVTexturedObjects(sce, !this->export_settings->active_uv_only);
-		std::set<Image *> uv_images = bc_getUVImages(sce, !this->export_settings->active_uv_only);
-		if (uv_images.size() > 0) {
-			openLibrary();
-			std::set<Image *>::iterator uv_images_iter;
-			for (uv_images_iter = uv_images.begin();
-				uv_images_iter != uv_images.end();
-				uv_images_iter++) {
-
-				Image *ima = *uv_images_iter;
-				std::string key(id_name(ima));
-				key = translate_id(key);
-				COLLADASW::Sampler sampler(COLLADASW::Sampler::SAMPLER_TYPE_2D,
-					key + COLLADASW::Sampler::SAMPLER_SID_SUFFIX,
-					key + COLLADASW::Sampler::SURFACE_SID_SUFFIX);
-				sampler.setImageId(key);
-
-				openEffect(key + "-effect");
-				COLLADASW::EffectProfile ep(mSW);
-				ep.setProfileType(COLLADASW::EffectProfile::COMMON);
-				ep.setShaderType(COLLADASW::EffectProfile::PHONG);
-				ep.setDiffuse(createTexture(ima, key, &sampler), false, "diffuse");
-				COLLADASW::ColorOrTexture cot = getcol(0, 0, 0, 1.0f);
-				ep.setSpecular(cot, false, "specular");
-				ep.openProfile();
-				ep.addProfileElements();
-				ep.addExtraTechniques(mSW);
-				ep.closeProfile();
-				closeEffect();
-			}
-			closeLibrary();
-		}
+	if (hasEffects(sce)) {
+		this->scene = sce;
+		openLibrary();
+		MaterialFunctor mf;
+		mf.forEachMaterialInExportSet<EffectsExporter>(sce, *this, this->export_settings->export_set);
+
+		closeLibrary();
 	}
 }
 
@@ -200,7 +175,8 @@ void EffectsExporter::operator()(Material *ma, Object *ob)
 {
 	// create a list of indices to textures of type TEX_IMAGE
 	std::vector<int> tex_indices;
-	createTextureIndices(ma, tex_indices);
+	if (this->export_settings->include_material_textures)
+		createTextureIndices(ma, tex_indices);
 
 	openEffect(translate_id(id_name(ma)) + "-effect");
 	
@@ -336,7 +312,7 @@ void EffectsExporter::operator()(Material *ma, Object *ob)
 
 	// used as fallback when MTex->uvname is "" (this is pretty common)
 	// it is indeed the correct value to use in that case
-	std::string active_uv(bc_get_active_uvlayer_name(ob));
+	std::string active_uv(getActiveUVLayerName(ob));
 
 	// write textures
 	// XXX very slow