godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5757 from Razzlegames/blendIndexFix 

Could not use pre multiply alpha for material in editor
This commit is contained in:
Rémi Verschelde 2016-07-18 00:54:38 +02:00 committed by GitHub
parent d6f2e41e6f 4e69bc3bff
commit be563a1663
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scene/resources/material.cpp
View File

@ -68,7 +68,7 @@ void Material::set_flag(Flag p_flag,bool p_enabled) {
void Material::set_blend_mode(BlendMode p_blend_mode) { void Material::set_blend_mode(BlendMode p_blend_mode) {
ERR_FAIL_INDEX(p_blend_mode,3); ERR_FAIL_INDEX(p_blend_mode,4);
blend_mode=p_blend_mode; blend_mode=p_blend_mode;
VisualServer::get_singleton()->material_set_blend_mode(material,(VS::MaterialBlendMode)p_blend_mode); VisualServer::get_singleton()->material_set_blend_mode(material,(VS::MaterialBlendMode)p_blend_mode);
_change_notify(); _change_notify();