From 98411b55683786879ac7f39806e471302b4e9f7d Mon Sep 17 00:00:00 2001 From: deve Date: Mon, 10 Nov 2014 10:32:26 +0100 Subject: [PATCH] Fixed compilation. --- src/graphics/material.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/graphics/material.cpp b/src/graphics/material.cpp index 62dbd3574..5de258692 100644 --- a/src/graphics/material.cpp +++ b/src/graphics/material.cpp @@ -28,6 +28,7 @@ #include "config/stk_config.hpp" #include "guiengine/engine.hpp" #include "graphics/callbacks.hpp" +#include "graphics/glwrap.hpp" #include "graphics/irr_driver.hpp" #include "graphics/particle_kind_manager.hpp" #include "graphics/shaders.hpp" @@ -37,7 +38,7 @@ #include "modes/world.hpp" #include "tracks/track.hpp" #include "utils/log.hpp" -#include "graphics/glwrap.hpp" +#include "utils/vs.hpp" #include #include @@ -74,7 +75,7 @@ Material::Material(const XMLNode *node, bool deprecated) node->get("clampv", &b); if (b) m_clamp_tex |= VCLAMP; //blender 2.4 style node->get("clampV", &b); if (b) m_clamp_tex |= VCLAMP; //blender 2.5 style - + std::string s; //node->get("adjust-image", &s ); //if(s=="premultiply") @@ -586,7 +587,7 @@ void Material::initParticlesEffect(const XMLNode *node) try { particles = pkm->getParticles(base.c_str()); - + if (particles == NULL) { Log::warn("Material::initParticlesEffect",