[Bf-blender-cvs] [361d578f9d9] master: fix: unreported: Collada using incompatible Enumeration types for compare

Gaia Clary noreply at git.blender.org
Tue Jul 23 15:09:13 CEST 2019


Commit: 361d578f9d928a6f03991d26d6ec9400b200d194
Author: Gaia Clary
Date:   Tue Jul 23 15:08:47 2019 +0200
Branches: master
https://developer.blender.org/rB361d578f9d928a6f03991d26d6ec9400b200d194

fix: unreported: Collada using incompatible Enumeration types for compare

===================================================================

M	source/blender/collada/Materials.cpp

===================================================================

diff --git a/source/blender/collada/Materials.cpp b/source/blender/collada/Materials.cpp
index e1d5b2e9d5c..3b2c68ef95e 100644
--- a/source/blender/collada/Materials.cpp
+++ b/source/blender/collada/Materials.cpp
@@ -196,7 +196,7 @@ void MaterialNode::set_alpha(COLLADAFW::EffectCommon::OpaqueMode mode,
     }
 
     float alpha = transparent_alpha * transparency_alpha;
-    if (mode == COLLADASW::EffectProfile::RGB_ZERO) {
+    if (mode == COLLADAFW::EffectCommon::RGB_ZERO) {
       alpha = 1 - alpha;
     }



More information about the Bf-blender-cvs mailing list