diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-02-24 22:05:07 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-02-24 22:53:14 +0400 |
| commit | 88f1c283a773bb76334d2d6a849d4e45c5c95373 (patch) | |
| tree | ccf09296aa15c2991fc2db6a3587f408fafea2a2 /source/blender/gpu/intern/gpu_draw.c | |
| parent | e2734eb1dd552f9a01ffc878aeac9299ca02ab0c (diff) | |
Tweak to T38766 fix: cycles now support setting viewport alpha for a material.
Diffstat (limited to 'source/blender/gpu/intern/gpu_draw.c')
| -rw-r--r-- | source/blender/gpu/intern/gpu_draw.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/gpu/intern/gpu_draw.c b/source/blender/gpu/intern/gpu_draw.c index 164d0c0b3f5..40ee745db23 100644 --- a/source/blender/gpu/intern/gpu_draw.c +++ b/source/blender/gpu/intern/gpu_draw.c @@ -1423,7 +1423,7 @@ void GPU_begin_object_materials(View3D *v3d, RegionView3D *rv3d, Scene *scene, O * and only transparent in the second 'alpha' pass. * - object transparency off: for glsl we draw both in a single pass, and * for solid we don't use transparency at all. */ - GMS.use_alpha_pass = (do_alpha_after != NULL) && !new_shading_nodes; + GMS.use_alpha_pass = (do_alpha_after != NULL); GMS.is_alpha_pass = (v3d->transp != FALSE); if (GMS.use_alpha_pass) *do_alpha_after = false; @@ -1485,7 +1485,7 @@ void GPU_begin_object_materials(View3D *v3d, RegionView3D *rv3d, Scene *scene, O /* fixed function opengl materials */ gpu_material_to_fixed(&GMS.matbuf[a], ma, gamma, ob, new_shading_nodes); - if (GMS.use_alpha_pass && (ma->mode & MA_TRANSP)) { + if (GMS.use_alpha_pass && ((ma->mode & MA_TRANSP) || (new_shading_nodes && ma->alpha != 1.0f))) { GMS.matbuf[a].diff[3]= ma->alpha; alphablend = (ma->alpha == 1.0f)? GPU_BLEND_SOLID: GPU_BLEND_ALPHA; } |