[Bf-blender-cvs] [6b902d78b32] master: cleanup: do no longer use deprecated Alpha channel from Shader diffuse color (use Shader's Alpha value instead)

[Gaia Clary]

Commit: 6b902d78b3297e94258b677aa8a4a7a05efd2694
Author: Gaia Clary
Date:   Mon Jan 20 18:47:45 2020 +0100
Branches: master
https://developer.blender.org/rB6b902d78b3297e94258b677aa8a4a7a05efd2694

cleanup: do no longer use deprecated Alpha channel from Shader diffuse color (use Shader's Alpha value instead)

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

M	source/blender/collada/collada_utils.cpp
M	source/blender/collada/collada_utils.h

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

diff --git a/source/blender/collada/collada_utils.cpp b/source/blender/collada/collada_utils.cpp
index b688840cb09..6116b04e122 100644
--- a/source/blender/collada/collada_utils.cpp
+++ b/source/blender/collada/collada_utils.cpp
@@ -1324,7 +1324,7 @@ COLLADASW::ColorOrTexture bc_get_base_color(Material *ma)
   Color default_color = {0.8, 0.8, 0.8, 1.0};
   bNode *shader = bc_get_master_shader(ma);
   if (ma->use_nodes && shader) {
-    return bc_get_cot_from_shader(shader, "Base Color", default_color);
+    return bc_get_cot_from_shader(shader, "Base Color", default_color, false);
   }
   else {
     return bc_get_cot(default_color);
@@ -1414,16 +1414,17 @@ double bc_get_float_from_shader(bNode *shader, double &val, std::string nodeid)
 
 COLLADASW::ColorOrTexture bc_get_cot_from_shader(bNode *shader,
                                                  std::string nodeid,
-                                                 Color &default_color)
+                                                 Color &default_color,
+                                                 bool with_alpha)
 {
   bNodeSocket *socket = nodeFindSocket(shader, SOCK_IN, nodeid.c_str());
   if (socket) {
     bNodeSocketValueRGBA *dcol = (bNodeSocketValueRGBA *)socket->default_value;
     float *col = dcol->value;
-    return bc_get_cot(col);
+    return bc_get_cot(col, with_alpha);
   }
   else {
-    return bc_get_cot(default_color); /* default black */
+    return bc_get_cot(default_color, with_alpha); /* default black */
   }
 }
 
@@ -1447,9 +1448,9 @@ COLLADASW::ColorOrTexture bc_get_cot(float r, float g, float b, float a)
   return cot;
 }
 
-COLLADASW::ColorOrTexture bc_get_cot(Color col)
+COLLADASW::ColorOrTexture bc_get_cot(Color col, bool with_alpha)
 {
-  COLLADASW::Color color(col[0], col[1], col[2], col[3]);
+  COLLADASW::Color color(col[0], col[1], col[2], (with_alpha) ? col[3] : 1.0);
   COLLADASW::ColorOrTexture cot(color);
   return cot;
 }
diff --git a/source/blender/collada/collada_utils.h b/source/blender/collada/collada_utils.h
index c0425e59d1a..b313fcd6e66 100644
--- a/source/blender/collada/collada_utils.h
+++ b/source/blender/collada/collada_utils.h
@@ -397,9 +397,10 @@ double bc_get_shininess(Material *ma);
 double bc_get_float_from_shader(bNode *shader, double &ior, std::string nodeid);
 COLLADASW::ColorOrTexture bc_get_cot_from_shader(bNode *shader,
                                                  std::string nodeid,
-                                                 Color &default_color);
+                                                 Color &default_color,
+                                                 bool with_alpha = true);
 
 COLLADASW::ColorOrTexture bc_get_cot(float r, float g, float b, float a);
-COLLADASW::ColorOrTexture bc_get_cot(Color col);
+COLLADASW::ColorOrTexture bc_get_cot(Color col, bool with_alpha = true);
 
 #endif