[Bf-blender-cvs] [820e721] master: Fix T47218: OpenGL render with missing alpha, due to recent OpenGL refactoring.

[Brecht Van Lommel]

Commit: 820e7214dddd13ecf415621f433ee762e2f95066
Author: Brecht Van Lommel
Date:   Mon Jan 25 09:32:17 2016 +0100
Branches: master
https://developer.blender.org/rB820e7214dddd13ecf415621f433ee762e2f95066

Fix T47218: OpenGL render with missing alpha, due to recent OpenGL refactoring.

Patch by Ralf Hölzemer.

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

M	source/blender/editors/space_view3d/drawmesh.c

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

diff --git a/source/blender/editors/space_view3d/drawmesh.c b/source/blender/editors/space_view3d/drawmesh.c
index 5c5652d..8deabfb 100644
--- a/source/blender/editors/space_view3d/drawmesh.c
+++ b/source/blender/editors/space_view3d/drawmesh.c
@@ -384,7 +384,7 @@ static bool set_draw_settings_cached(int clearcache, MTexPoly *texface, Material
 			float specular[3];
 			mul_v3_v3fl(specular, &ma->specr, ma->spec);
 
-			GPU_basic_shader_colors(NULL, specular, ma->har, 0.0f);
+			GPU_basic_shader_colors(NULL, specular, ma->har, 1.0f);
 			GPU_basic_shader_bind(options);
 		}
 		else {
@@ -1078,7 +1078,7 @@ static void tex_mat_set_texture_cb(void *userData, int mat_nr, void *attribs)
 			if (data->two_sided_lighting)
 				options |= GPU_SHADER_TWO_SIDED;
 
-			GPU_basic_shader_colors(diffuse, NULL, 0, 0.0f);
+			GPU_basic_shader_colors(diffuse, NULL, 0, 1.0f);
 			GPU_basic_shader_bind(options);
 
 			return;