Commit 0e19658b authored by Jan Möbius's avatar Jan Möbius

Fixed the cmake commit which reverted most of the branding

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@17087 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 64f9fae3
......@@ -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()
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment