diff options
| author | Gaia Clary <gaia.clary@machinimatrix.org> | 2016-07-15 17:12:39 +0300 |
|---|---|---|
| committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2016-07-15 17:14:51 +0300 |
| commit | 27641b51e7acef323a88f5cf96eac1229175eb55 (patch) | |
| tree | e9d7c5e33425aa6d6068062a77796b48aed3b465 /source/blender/collada | |
| parent | e3b79544be53801e1cf0228ba635adbf2880ad8a (diff) | |
Collada: changed specification of material alpha from using transparency to using transparent with opaque=A_ONE
Diffstat (limited to 'source/blender/collada')
| -rw-r--r-- | source/blender/collada/EffectExporter.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/collada/EffectExporter.cpp b/source/blender/collada/EffectExporter.cpp index 13dc1eda580..76b51148509 100644 --- a/source/blender/collada/EffectExporter.cpp +++ b/source/blender/collada/EffectExporter.cpp @@ -30,6 +30,7 @@ #include <set> #include "COLLADASWEffectProfile.h" +#include "COLLADAFWColorOrTexture.h" #include "EffectExporter.h" #include "DocumentExporter.h" @@ -217,9 +218,9 @@ void EffectsExporter::operator()(Material *ma, Object *ob) // transparency if (ma->mode & MA_TRANSP) { // Tod: because we are in A_ONE mode transparency is calculated like this: - ep.setTransparency(ma->alpha, false, "transparency"); - // cot = getcol(1.0f, 1.0f, 1.0f, 1.0f); - // ep.setTransparent(cot); + cot = getcol(1.0f, 1.0f, 1.0f, ma->alpha); + ep.setTransparent(cot); + ep.setOpaque(COLLADASW::EffectProfile::A_ONE); } // emission |