From: Alex <24834740+GreenXenith@users.noreply.github.com>
Date: Sat, 11 Apr 2020 11:45:14 +0000 (-0700)
Subject: Use TILE_MATERIAL_ALPHA for use_texture_alpha entity flag (#9639)
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=fbf74dc52456b13b0dbd7bb9d3206e5828254910;p=oweals%2Fminetest.git

Use TILE_MATERIAL_ALPHA for use_texture_alpha entity flag (#9639)

Fixes #9637.
---

diff --git a/src/client/content_cao.cpp b/src/client/content_cao.cpp
index 798899f9a..39ea4ab1e 100644
--- a/src/client/content_cao.cpp
+++ b/src/client/content_cao.cpp
@@ -584,7 +584,7 @@ void GenericCAO::addToScene(ITextureSource *tsrc)
 		IShaderSource *shader_source = m_client->getShaderSource();
 		u32 shader_id = shader_source->getShader(
 				"object_shader",
-				TILE_MATERIAL_BASIC,
+				(m_prop.use_texture_alpha) ? TILE_MATERIAL_ALPHA : TILE_MATERIAL_BASIC,
 				NDT_NORMAL);
 		m_material_type = shader_source->getShaderInfo(shader_id).material;
 	} else {