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-09-18 11:43:59 +10:00
commit e7096bc3b0
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/graphics/render.cpp
View File

@ -399,8 +399,6 @@ void IrrDriver::renderScene(scene::ICameraSceneNode * const camnode, unsigned po
renderSolidSecondPass();
PROFILER_POP_CPU_MARKER();
m_sync = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
if (getNormals())
{
m_rtts->getFBO(FBO_NORMAL_AND_DEPTHS).Bind();
@ -453,6 +451,8 @@ void IrrDriver::renderScene(scene::ICameraSceneNode * const camnode, unsigned po
PROFILER_POP_CPU_MARKER();
}
m_sync = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
// Render particles
{
PROFILER_PUSH_CPU_MARKER("- Particles", 0xFF, 0xFF, 0x00);

4
src/tinygettext/dictionary_manager.cpp
View File

@ -244,11 +244,11 @@ DictionaryManager::add_directory(const std::string& pathname)
search_path.push_back(pathname);
}
void
/*void
DictionaryManager::set_filesystem(std::auto_ptr<FileSystem> filesystem_)
{
filesystem = filesystem_;
}
}*/
// ----------------------------------------------------------------------------
/** This function converts a .po filename (e.g. zh_TW.po) into a language
* specification (zh_TW). On case insensitive file systems (think windows)

2
src/tinygettext/dictionary_manager.hpp
View File

@ -89,7 +89,7 @@ public:
/** Return a set of the available languages in their country code */
std::set<Language> get_languages();
void set_filesystem(std::auto_ptr<FileSystem> filesystem);
//void set_filesystem(std::auto_ptr<FileSystem> filesystem);
std::string convertFilename2Language(const std::string &s_in) const;