Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaia Clary <gaia.clary@machinimatrix.org>2020-01-20 20:47:45 +0300
committerGaia Clary <gaia.clary@machinimatrix.org>2020-01-20 20:47:57 +0300
commit6b902d78b3297e94258b677aa8a4a7a05efd2694 (patch)
treefd3f2da81c89a15ab09f8baddc0fcc6568664497 /source/blender/collada/collada_utils.h
parent932cfdbe98fd93b5e2f2c11c3e15310cbedf6f25 (diff)
cleanup: do no longer use deprecated Alpha channel from Shader diffuse color (use Shader's Alpha value instead)
Diffstat (limited to 'source/blender/collada/collada_utils.h')
-rw-r--r--source/blender/collada/collada_utils.h5
1 files changed, 3 insertions, 2 deletions
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