fix T61122 : Added support for Materials with Nodes disabled.

- The Collada exporter did not take care of
  material transparency when nodes are turned off.

- recent change to use ma->alpha_threshold seems to have
  been wrong. transparency is now taken from ma->a when
  nodes are turned off.

1 files changed, 3 insertions, 3 deletions

diff --git a/source/blender/collada/collada_utils.cpp b/source/blender/collada/collada_utils.cpp
index d47ab111487..66c8f94b6c8 100644
--- a/source/blender/collada/collada_utils.cpp
+++ b/source/blender/collada/collada_utils.cpp
@@ -1354,18 +1354,18 @@ bc_node_add_link(ntree, nmap["main"], 0, nmap["out"], 0);
 COLLADASW::ColorOrTexture bc_get_base_color(Material *ma)
 {
 	bNode *master_shader = bc_get_master_shader(ma);
-	if (master_shader) {
+	if (ma->use_nodes && master_shader) {
 		return bc_get_base_color(master_shader);
 	}
 	else {
-		return bc_get_cot(ma->r, ma->g, ma->b, ma->alpha_threshold);
+		return bc_get_cot(ma->r, ma->g, ma->b, ma->a);
 	}
 }
 
 COLLADASW::ColorOrTexture bc_get_specular_color(Material *ma, bool use_fallback)
 {
 	bNode *master_shader = bc_get_master_shader(ma);
-	if (master_shader) {
+	if (ma->use_nodes && master_shader) {
 		return bc_get_specular_color(master_shader);
 	}
 	else if (use_fallback) {