Commit: 7ef1ed15f10c46275486fce1bca0b0355848b32d
Author: Brecht Van Lommel
Date: Mon Feb 24 15:43:26 2014 +0100
https://developer.blender.org/rB7ef1ed15f10c46275486fce1bca0b0355848b32d
Fix T38766: blender material transparency setting not taken into account for
viewport.
===================================================================
M source/blender/gpu/intern/gpu_draw.c
M source/blender/makesrna/intern/rna_material.c
===================================================================
diff --git a/source/blender/gpu/intern/gpu_draw.c
b/source/blender/gpu/intern/gpu_draw.c
index b9de672..164d0c0 100644
--- a/source/blender/gpu/intern/gpu_draw.c
+++ b/source/blender/gpu/intern/gpu_draw.c
@@ -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) {
+ if (GMS.use_alpha_pass && (ma->mode &
MA_TRANSP)) {
GMS.matbuf[a].diff[3]= ma->alpha;
alphablend = (ma->alpha == 1.0f)?
GPU_BLEND_SOLID: GPU_BLEND_ALPHA;
}
diff --git a/source/blender/makesrna/intern/rna_material.c
b/source/blender/makesrna/intern/rna_material.c
index da343a7..44fdfe7 100644
--- a/source/blender/makesrna/intern/rna_material.c
+++ b/source/blender/makesrna/intern/rna_material.c
@@ -1750,7 +1750,7 @@ void RNA_def_material(BlenderRNA *brna)
prop = RNA_def_property(srna, "use_transparency", PROP_BOOLEAN,
PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_TRANSP);
RNA_def_property_ui_text(prop, "Transparency", "Render material as
transparent");
- RNA_def_property_update(prop, 0, "rna_Material_update");
+ RNA_def_property_update(prop, 0, "rna_Material_draw_update");
prop = RNA_def_property(srna, "transparency_method", PROP_ENUM,
PROP_NONE);
RNA_def_property_enum_bitflag_sdna(prop, NULL, "mode");
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
