blender
/
blender
132
398
Fork 577
Code Issues 6.2k Pull Requests 745 Projects 19 Wiki Activity

Tweak to T38766 fix: cycles now support setting viewport alpha for a material.

This commit is contained in:
Brecht Van Lommel 2014-02-24 19:05:07 +01:00
parent e2734eb1dd
commit 88f1c283a7
Notes: blender-bot 2024-01-16 18:05:25 +01:00 
Referenced by issue #38766, Material transparency problems in solid viewport
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
intern/cycles/blender/addon/ui.py
View File

@ -1001,8 +1001,9 @@ class CyclesMaterial_PT_settings(CyclesButtonsPanel, Panel):
split = layout.split()
col = split.column()
col = split.column(align=True)
col.prop(mat, "diffuse_color", text="Viewport Color")
col.prop(mat, "alpha")
col = split.column(align=True)
col.label()

4
source/blender/gpu/intern/gpu_draw.c
View File

@ -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;
}