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

Remove call to createMeshWelded, now handled in B3D exporter

Browse Source
This commit is contained in:
Marianne Gagnon 2014-05-12 19:03:40 -04:00
parent 26d48cdad0
commit bcc46b149e
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/graphics/irr_driver.cpp
View File

@ -841,8 +841,7 @@ scene::IMesh *IrrDriver::getMesh(const std::string &filename)
filename.c_str()); filename.c_str());
return NULL; return NULL;
} }
scene::IMeshManipulator *mani = irr_driver->getVideoDriver()->getMeshManipulator(); return am->getMesh(0);
return mani->createMeshWelded(am->getMesh(0));
} // getMesh } // getMesh
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@ -1628,7 +1627,7 @@ void IrrDriver::displayFPS()
if (UserConfigParams::m_artist_debug_mode) if (UserConfigParams::m_artist_debug_mode)
{ {
sprintf(buffer, "FPS: %i/%i/%i - Objects (P1:%d P2:%d T:%d) KTris - LightDst : ~%d", sprintf(buffer, "FPS: %i/%i/%i - Objects (P1:%d P2:%d T:%d) - LightDst : ~%d",
min, fps, max, object_count[SOLID_NORMAL_AND_DEPTH_PASS], object_count[SOLID_NORMAL_AND_DEPTH_PASS], object_count[TRANSPARENT_PASS], m_last_light_bucket_distance); min, fps, max, object_count[SOLID_NORMAL_AND_DEPTH_PASS], object_count[SOLID_NORMAL_AND_DEPTH_PASS], object_count[TRANSPARENT_PASS], m_last_light_bucket_distance);
object_count[SOLID_NORMAL_AND_DEPTH_PASS] = 0; object_count[SOLID_NORMAL_AND_DEPTH_PASS] = 0;
object_count[SOLID_NORMAL_AND_DEPTH_PASS] = 0; object_count[SOLID_NORMAL_AND_DEPTH_PASS] = 0;