Commit ca2516dc authored by Dirk Wilden's avatar Dirk Wilden

removed textureData not found warnings for non mesh types

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@5852 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 16c4cd5a
...@@ -278,7 +278,6 @@ void TextureControlPlugin::fileOpened( int _id ) { ...@@ -278,7 +278,6 @@ void TextureControlPlugin::fileOpened( int _id ) {
// Check if we support this kind of data // Check if we support this kind of data
if ( !obj->dataType(DATA_TRIANGLE_MESH) && !obj->dataType(DATA_POLY_MESH) ) { if ( !obj->dataType(DATA_TRIANGLE_MESH) && !obj->dataType(DATA_POLY_MESH) ) {
emit log(LOGERR,"Trying to add textures to object failed because of unsupported object type");
return; return;
} }
...@@ -364,6 +363,10 @@ void TextureControlPlugin::slotTextureUpdated( QString _textureName , int _ident ...@@ -364,6 +363,10 @@ void TextureControlPlugin::slotTextureUpdated( QString _textureName , int _ident
return; return;
} }
//skip object if its not a mesh
if( !obj->dataType( DATA_TRIANGLE_MESH ) && !obj->dataType( DATA_POLY_MESH ) )
return;
// ================================================================================ // ================================================================================
// Get objects texture data and verify that texture exists // Get objects texture data and verify that texture exists
// ================================================================================ // ================================================================================
...@@ -544,6 +547,10 @@ void TextureControlPlugin::slotObjectUpdated(int _identifier) ...@@ -544,6 +547,10 @@ void TextureControlPlugin::slotObjectUpdated(int _identifier)
return; return;
} }
//skip object if its not a mesh
if( !obj->dataType( DATA_TRIANGLE_MESH ) && !obj->dataType( DATA_POLY_MESH ) )
return;
// ================================================================================ // ================================================================================
// Get objects texture data and verify that texture exists // Get objects texture data and verify that texture exists
// ================================================================================ // ================================================================================
...@@ -1104,6 +1111,10 @@ void TextureControlPlugin::slotUpdateContextMenu( int _objectId ) { ...@@ -1104,6 +1111,10 @@ void TextureControlPlugin::slotUpdateContextMenu( int _objectId ) {
return; return;
} }
//skip object if its not a mesh
if( !obj->dataType( DATA_TRIANGLE_MESH ) && !obj->dataType( DATA_POLY_MESH ) )
return;
// ================================================================================ // ================================================================================
// Get objects texture data and verify that texture exists // Get objects texture data and verify that texture exists
// ================================================================================ // ================================================================================
......
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