From c3d03b4434c8554bbfff6cdc549bb089dec1da28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Foucault?= Date: Wed, 14 Nov 2018 11:44:05 +0100 Subject: Lamps: Remove HEMI light type This type is not supported by either Eevee or Cycles. If other types of lamps are needed by external engines, we should support adding custom types. --- source/blender/collada/DocumentImporter.cpp | 3 ++- source/blender/collada/LightExporter.cpp | 15 ++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) (limited to 'source/blender/collada') diff --git a/source/blender/collada/DocumentImporter.cpp b/source/blender/collada/DocumentImporter.cpp index 50a9e351bc6..f10252c01c5 100644 --- a/source/blender/collada/DocumentImporter.cpp +++ b/source/blender/collada/DocumentImporter.cpp @@ -1200,7 +1200,8 @@ bool DocumentImporter::writeLight(const COLLADAFW::Light *light) switch (type) { case COLLADAFW::Light::AMBIENT_LIGHT: { - lamp->type = LA_HEMI; + /* TODO Fix */ + // lamp->type = LA_HEMI; } break; case COLLADAFW::Light::SPOT_LIGHT: diff --git a/source/blender/collada/LightExporter.cpp b/source/blender/collada/LightExporter.cpp index 11377e06ce8..53fcbd1bb1a 100644 --- a/source/blender/collada/LightExporter.cpp +++ b/source/blender/collada/LightExporter.cpp @@ -90,13 +90,14 @@ void LightsExporter::operator()(Object *ob) 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); - } + /* Hemi were removed from 2.8 */ + // 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); -- cgit v1.2.3