diff options
author | Gaia Clary <gaia.clary@machinimatrix.org> | 2019-02-20 22:46:20 +0300 |
---|---|---|
committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2019-02-20 22:47:08 +0300 |
commit | e2cefc7dad9f254649ed74d32e1ce9875e21b947 (patch) | |
tree | 0e841262ca641a6efadf852aa1499a70de16c73f /source/blender/collada | |
parent | 4ec6b16b4eb62b5b743c61f22e85534ae811804a (diff) |
fix T61122 : Collada exporter exported alpha value (always 0) from deprecated material attribute
Diffstat (limited to 'source/blender/collada')
-rw-r--r-- | source/blender/collada/EffectExporter.cpp | 4 | ||||
-rw-r--r-- | source/blender/collada/collada_utils.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/collada/EffectExporter.cpp b/source/blender/collada/EffectExporter.cpp index e4a35bcfcd6..b6f8ba9ba1f 100644 --- a/source/blender/collada/EffectExporter.cpp +++ b/source/blender/collada/EffectExporter.cpp @@ -98,12 +98,12 @@ void EffectsExporter::set_shader_type(COLLADASW::EffectProfile &ep, Material *ma void EffectsExporter::set_transparency(COLLADASW::EffectProfile &ep, Material *ma) { - if (ma->alpha == 1.0f) { + if (ma->alpha_threshold == 1.0f) { return; // have no transparency } // Tod: because we are in A_ONE mode transparency is calculated like this: - COLLADASW::ColorOrTexture cot = getcol(1.0f, 1.0f, 1.0f, ma->alpha); + COLLADASW::ColorOrTexture cot = getcol(1.0f, 1.0f, 1.0f, ma->alpha_threshold); ep.setTransparent(cot); ep.setOpaque(COLLADASW::EffectProfile::A_ONE); } diff --git a/source/blender/collada/collada_utils.cpp b/source/blender/collada/collada_utils.cpp index 12eeb73b583..d47ab111487 100644 --- a/source/blender/collada/collada_utils.cpp +++ b/source/blender/collada/collada_utils.cpp @@ -1358,7 +1358,7 @@ COLLADASW::ColorOrTexture bc_get_base_color(Material *ma) return bc_get_base_color(master_shader); } else { - return bc_get_cot(ma->r, ma->g, ma->b, ma->alpha); + return bc_get_cot(ma->r, ma->g, ma->b, ma->alpha_threshold); } } |