Commit: 2e169054802825f1ab5e74560ef188bc62a14f85
Author: Gaia Clary
Date: Wed Nov 14 14:50:56 2018 +0100
Branches: collada2.8
https://developer.blender.org/rB2e169054802825f1ab5e74560ef188bc62a14f85
fix: collada adjust importer/exporter for no longer supported HEMI lights
===================================================================
M source/blender/collada/DocumentImporter.cpp
M source/blender/collada/LightExporter.cpp
===================================================================
diff --git a/source/blender/collada/DocumentImporter.cpp
b/source/blender/collada/DocumentImporter.cpp
index 2ed302f8ac1..83491829565 100644
--- a/source/blender/collada/DocumentImporter.cpp
+++ b/source/blender/collada/DocumentImporter.cpp
@@ -1075,11 +1075,10 @@ bool DocumentImporter::writeLight(const
COLLADAFW::Light *light)
lamp->energy = e;
lamp->dist = d;
- COLLADAFW::Light::LightType type = light->getLightType();
- switch (type) {
+ switch (light->getLightType()) {
case COLLADAFW::Light::AMBIENT_LIGHT:
{
- lamp->type = LA_HEMI;
+ lamp->type = LA_SUN; //TODO needs more thoughts
}
break;
case COLLADAFW::Light::SPOT_LIGHT:
diff --git a/source/blender/collada/LightExporter.cpp
b/source/blender/collada/LightExporter.cpp
index 11377e06ce8..b1f805bfb87 100644
--- a/source/blender/collada/LightExporter.cpp
+++ b/source/blender/collada/LightExporter.cpp
@@ -89,14 +89,7 @@ void LightsExporter::operator()(Object *ob)
exportBlenderProfile(cla, la);
addLight(cla);
}
- // hemi
- else if (la->type == LA_HEMI) {
- COLLADASW::AmbientLight cla(mSW, la_id, la_name);
- cla.setColor(col, false, "color");
- cla.setConstantAttenuation(constatt);
- exportBlenderProfile(cla, la);
- addLight(cla);
- }
+
// spot
else if (la->type == LA_SPOT) {
COLLADASW::SpotLight cla(mSW, la_id, la_name);
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
