From 669523828405516042eda66c23bc5e24d24f6856 Mon Sep 17 00:00:00 2001 From: Marianne Gagnon Date: Tue, 23 Sep 2014 20:11:03 -0400 Subject: [PATCH] Fix loading normal maps (new XML syntax) --- src/graphics/material.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/graphics/material.cpp b/src/graphics/material.cpp index b931cbb5f..a9771816f 100644 --- a/src/graphics/material.cpp +++ b/src/graphics/material.cpp @@ -341,6 +341,11 @@ Material::Material(const XMLNode *node, bool deprecated) // ---- End backwards compatibility } + if (m_shader_type == SHADERTYPE_SOLID) + { + node->get("normal-map", &m_normal_map_tex); + } + if (m_disable_z_write && m_shader_type != SHADERTYPE_ALPHA_BLEND && m_shader_type != SHADERTYPE_ADDITIVE) { Log::debug("material", "Disabling writes to z buffer only makes sense when compositing is blending or additive (for %s)", m_texname.c_str());