diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-07-18 00:54:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-18 00:54:38 +0200 |
| commit | be563a1663fa87510ddd59aced23b34560915dc2 (patch) | |
| tree | b3a2c54d79191cedcdec5bce75a00f2b7c7ad1aa /scene/resources | |
| parent | d6f2e41e6f6ed2de6afd8d1e08085e732383b9cb (diff) | |
| parent | 4e69bc3bff38db3e22f0171e55355205277f8bde (diff) | |
Merge pull request #5757 from Razzlegames/blendIndexFix
Could not use pre multiply alpha for material in editor
Diffstat (limited to 'scene/resources')
| -rw-r--r-- | scene/resources/material.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/resources/material.cpp b/scene/resources/material.cpp index f6213f74e8..9dc54ef0e4 100644 --- a/scene/resources/material.cpp +++ b/scene/resources/material.cpp @@ -68,7 +68,7 @@ void Material::set_flag(Flag p_flag,bool p_enabled) { 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; VisualServer::get_singleton()->material_set_blend_mode(material,(VS::MaterialBlendMode)p_blend_mode); _change_notify(); |