From c5e31c96b186598bfe27ba8fc47da6d9317c6150 Mon Sep 17 00:00:00 2001
From: vlj <vljn@ovi.com>
Date: Fri, 9 May 2014 15:11:18 +0200
Subject: [PATCH] Simplify mesh temporary.

Until we move this code to the exporter.
---
 src/graphics/irr_driver.cpp      | 3 ++-
 src/graphics/post_processing.cpp | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/graphics/irr_driver.cpp b/src/graphics/irr_driver.cpp
index 911a591ec..2cfa74e09 100644
--- a/src/graphics/irr_driver.cpp
+++ b/src/graphics/irr_driver.cpp
@@ -841,7 +841,8 @@ scene::IMesh *IrrDriver::getMesh(const std::string &filename)
                    filename.c_str());
         return NULL;
     }
-    return am->getMesh(0);
+    scene::IMeshManipulator *mani = irr_driver->getVideoDriver()->getMeshManipulator();
+    return mani->createMeshWelded(am->getMesh(0));
 }   // getMesh
 
 // ----------------------------------------------------------------------------
diff --git a/src/graphics/post_processing.cpp b/src/graphics/post_processing.cpp
index fb1384069..310199600 100644
--- a/src/graphics/post_processing.cpp
+++ b/src/graphics/post_processing.cpp
@@ -786,12 +786,12 @@ void PostProcessing::render(scene::ICameraSceneNode * const camnode)
 
     //computeLogLuminance(in_rtt);
     {
-        PROFILER_PUSH_CPU_MARKER("- Tonemap", 0xFF, 0x00, 0x00);
+//        PROFILER_PUSH_CPU_MARKER("- Tonemap", 0xFF, 0x00, 0x00);
         ScopedGPUTimer Timer(irr_driver->getGPUTimer(Q_TONEMAP));
         toneMap(out_fbo, in_rtt);
         std::swap(in_rtt, out_rtt);
         std::swap(in_fbo, out_fbo);
-        PROFILER_POP_CPU_MARKER();
+//        PROFILER_POP_CPU_MARKER();
     }
 
     {