From 6b902d78b3297e94258b677aa8a4a7a05efd2694 Mon Sep 17 00:00:00 2001 From: Gaia Clary Date: Mon, 20 Jan 2020 18:47:45 +0100 Subject: cleanup: do no longer use deprecated Alpha channel from Shader diffuse color (use Shader's Alpha value instead) --- source/blender/collada/collada_utils.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'source/blender/collada/collada_utils.h') 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 -- cgit v1.2.3