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

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

Browse Source
This commit is contained in:
samuncle 2014-11-10 17:12:45 +01:00
commit b70f2cd176
4 changed files with 12 additions and 10 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 } // end namespace irr
#if defined(_IRR_WINDOWS_API_) #if defined(_IRR_WINDOWS_API_) && !defined(_IRR_STATIC_LIB_)
BOOL APIENTRY DllMain( HANDLE hModule, BOOL APIENTRY DllMain( HANDLE hModule,
DWORD ul_reason_for_call, DWORD ul_reason_for_call,

3
src/graphics/material.cpp
View File

@ -28,6 +28,7 @@
#include "config/stk_config.hpp" #include "config/stk_config.hpp"
#include "guiengine/engine.hpp" #include "guiengine/engine.hpp"
#include "graphics/callbacks.hpp" #include "graphics/callbacks.hpp"
#include "graphics/glwrap.hpp"
#include "graphics/irr_driver.hpp" #include "graphics/irr_driver.hpp"
#include "graphics/particle_kind_manager.hpp" #include "graphics/particle_kind_manager.hpp"
#include "graphics/shaders.hpp" #include "graphics/shaders.hpp"
@ -37,7 +38,7 @@
#include "modes/world.hpp" #include "modes/world.hpp"
#include "tracks/track.hpp" #include "tracks/track.hpp"
#include "utils/log.hpp" #include "utils/log.hpp"
#include "graphics/glwrap.hpp" #include "utils/vs.hpp"
#include <IMaterialRendererServices.h> #include <IMaterialRendererServices.h>
#include <ISceneNode.h> #include <ISceneNode.h>

3
src/guiengine/widgets/icon_button_widget.cpp
View File

@ -296,7 +296,8 @@ video::ITexture* IconButtonWidget::getDeactivatedTexture(video::ITexture* textur
std::string name = texture->getName().getPath().c_str(); std::string name = texture->getName().getPath().c_str();
name += "_disabled"; name += "_disabled";
t = irr_driver->getTexture(name); t = irr_driver->getTexture(name, /*premul*/false, /*prediv*/false,
/*compain_if_not_found*/false);
if (t == NULL) if (t == NULL)
{ {
SColor c; SColor c;

2
src/utils/crash_reporting.cpp
View File

@ -20,7 +20,7 @@
#include "log.hpp" #include "log.hpp"
#include <string.h> #include <string.h>
#if defined(WIN32) && !defined(DEBUG) #if defined(WIN32) && !defined(DEBUG) && !defined(__MINGW32__)
// --------------------- Windows version ----------------- // --------------------- Windows version -----------------
#include <Windows.h> #include <Windows.h>
#include <DbgHelp.h> #include <DbgHelp.h>