From 26ef2ca0d29be747a68679bc1d9a5b448a36deb8 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 22 Dec 2003 14:05:04 +0000 Subject: [PATCH] Updates from Nick. --- src/osgPlugins/txp/TXPArchive.cpp | 2 +- src/osgPlugins/txp/TXPNode.cpp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/osgPlugins/txp/TXPArchive.cpp b/src/osgPlugins/txp/TXPArchive.cpp index d4a26defc..0407ce91e 100644 --- a/src/osgPlugins/txp/TXPArchive.cpp +++ b/src/osgPlugins/txp/TXPArchive.cpp @@ -557,7 +557,7 @@ osg::Group* TXPArchive::getTileContent(int x, int y, int lod) trpgMemReadBuffer buf(GetEndian()); if (!ReadTile(x,y,lod,buf)) { - return NULL; + return new osg::Group; } osg::Group *tileGroup = _parser->parseScene(buf,_gstates,_models); diff --git a/src/osgPlugins/txp/TXPNode.cpp b/src/osgPlugins/txp/TXPNode.cpp index 1252cfb50..68b72dba0 100644 --- a/src/osgPlugins/txp/TXPNode.cpp +++ b/src/osgPlugins/txp/TXPNode.cpp @@ -103,6 +103,7 @@ bool TXPNode::loadArchive() return false; } + /* if (_archive->loadMaterials() == false) { TXPNodeERROR("loadArchive()") << "failed to load materials from archive: \"" << _archiveName << "\"" << std::endl; @@ -120,6 +121,7 @@ bool TXPNode::loadArchive() TXPNodeERROR("loadArchive()") << "failed to load light attributes from archive: \"" << _archiveName << "\"" << std::endl; return false; } + */ _archive->getOrigin(_originX,_originY); _archive->getExtents(_extents);