]> git.lizzy.rs Git - dragonfireclient.git/commitdiff
Allow missing shaders
authornumzero <numzer0@yandex.ru>
Sun, 22 Nov 2020 14:36:59 +0000 (17:36 +0300)
committerlhofhansl <larsh@apache.org>
Thu, 26 Nov 2020 20:49:10 +0000 (12:49 -0800)
src/client/shader.cpp

index 4f64305790ed7bf7cf9bb8adb18b84a4f0f63b2d..1cec20d2ca520f4a4599293ae4948b95a3048a6e 100644 (file)
@@ -577,7 +577,6 @@ ShaderInfo generate_shader(const std::string &name, u8 material_type, u8 drawtyp
        shaderinfo.name = name;
        shaderinfo.material_type = material_type;
        shaderinfo.drawtype = drawtype;
-       shaderinfo.material = video::EMT_SOLID;
        switch (material_type) {
        case TILE_MATERIAL_OPAQUE:
        case TILE_MATERIAL_LIQUID_OPAQUE:
@@ -598,6 +597,7 @@ ShaderInfo generate_shader(const std::string &name, u8 material_type, u8 drawtyp
                shaderinfo.base_material = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF;
                break;
        }
+       shaderinfo.material = shaderinfo.base_material;
 
        bool enable_shaders = g_settings->getBool("enable_shaders");
        if (!enable_shaders)