diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1dde1b4be31191acec07f08bed54b2f383accbce..e76a9eca336049737edb69ae8a523e3549c20905 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,13 +2,6 @@ include(plugin)
 
 find_package(Qwt5)
 
-if(Qwt5_Qt4_FOUND)
-  add_definitions(-DWITH_QWT)
-  openflipper_plugin(INCDIRS ${Qwt5_INCLUDE_DIR} LIBRARIES ${Qwt5_Qt4_LIBRARY})
-else()
-  openflipper_plugin()
-endif()
-
 if (EXISTS ${CMAKE_SOURCE_DIR}/ObjectTypes/PolyhedralMesh)
     add_definitions (-DENABLE_OPENVOLUMEMESH_SUPPORT)
     add_definitions (-DENABLE_OPENVOLUMEMESH_POLYHEDRAL_SUPPORT)
@@ -18,3 +11,20 @@ if (EXISTS ${CMAKE_SOURCE_DIR}/ObjectTypes/HexahedralMesh)
     add_definitions (-DENABLE_OPENVOLUMEMESH_SUPPORT)
     add_definitions (-DENABLE_OPENVOLUMEMESH_HEXAHEDRAL_SUPPORT)
 endif()
+
+if(Qwt5_Qt4_FOUND)
+  add_definitions(-DWITH_QWT)
+  openflipper_plugin(INCDIRS ${Qwt5_INCLUDE_DIR} LIBRARIES ${Qwt5_Qt4_LIBRARY})
+else()
+  openflipper_plugin()
+endif()
+
+
+
+
+
+
+
+
+
+
diff --git a/TextureControl.cc b/TextureControl.cc
index dc0109fb06ff143fa816f516e40fb65945df232f..0c84d582aeec349199a7252bd99450d6e0207c87 100644
--- a/TextureControl.cc
+++ b/TextureControl.cc
@@ -937,8 +937,8 @@ void TextureControlPlugin::doUpdateTextureOVM ( Texture& _texture, VolumeMeshT&
       OpenVolumeMesh::VertexPropertyT< double > texture = _mesh.template request_vertex_property<double>(_texture.name().toStdString());
       copyTexture(_texture, _mesh, _obj, texture);
 
-      VolumeMeshDrawModesContainer drawModes;
-      _obj.setObjectDrawMode(drawModes.facesTextured);
+      VolumeMeshDrawModesContainer drawModesVolumeMesh;
+      _obj.setObjectDrawMode(drawModesVolumeMesh.facesTextured);
 
     }
     else if ( _texture.dimension() == 2 )
@@ -951,8 +951,8 @@ void TextureControlPlugin::doUpdateTextureOVM ( Texture& _texture, VolumeMeshT&
         OpenVolumeMesh::VertexPropertyT< ACG::Vec2d > texture = _mesh.template request_vertex_property<ACG::Vec2d>(_texture.name().toStdString());
         copyTexture(_texture, _mesh, _obj, texture);
 
-        VolumeMeshDrawModesContainer drawModes;
-        _obj.setObjectDrawMode(drawModes.facesTextured);
+        VolumeMeshDrawModesContainer drawModesVolumeMesh;
+        _obj.setObjectDrawMode(drawModesVolumeMesh.facesTextured);
 
     }
     else
@@ -967,7 +967,7 @@ void TextureControlPlugin::doUpdateTextureOVM ( Texture& _texture, VolumeMeshT&
 void TextureControlPlugin::slotDrawModeChanged(int _viewerId ) {
 
 #ifdef ENABLE_OPENVLUMEMESH_SUPPORT
-  VolumeMeshDrawModesContainer drawModes;
+  VolumeMeshDrawModesContainer drawModesVolumeMesh;
 #endif
 
   // Only update if we have a relevant draw mode
@@ -978,8 +978,8 @@ void TextureControlPlugin::slotDrawModeChanged(int _viewerId ) {
 
 #ifdef ENABLE_OPENVLUMEMESH_SUPPORT
           ||
-          ( PluginFunctions::drawMode(_viewerId) &= drawModes.facesTextured) ||
-          ( PluginFunctions::drawMode(_viewerId) &= drawModes.facesTexturedShaded)
+          ( PluginFunctions::drawMode(_viewerId) &= drawModesVolumeMesh.facesTextured) ||
+          ( PluginFunctions::drawMode(_viewerId) &= drawModesVolumeMesh.facesTexturedShaded)
 #endif
           )) {
     return;