ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:supertuxkart/stk-code

Browse Source
This commit is contained in:
hiker 2014-11-10 22:27:25 +11:00
commit b6b4636861
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/irrlicht/source/Irrlicht/Irrlicht.cpp
View File

@ -127,7 +127,7 @@ namespace video
} // end namespace irr
#if defined(_IRR_WINDOWS_API_)
#if defined(_IRR_WINDOWS_API_) && !defined(_IRR_STATIC_LIB_)
BOOL APIENTRY DllMain( HANDLE hModule,
DWORD ul_reason_for_call,

7
src/graphics/material.cpp
View File

@ -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 <IMaterialRendererServices.h>
#include <ISceneNode.h>
@ -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",