Revision: 7702
http://playerstage.svn.sourceforge.net/playerstage/?rev=7702&view=rev
Author: natepak
Date: 2009-05-20 18:22:48 +0000 (Wed, 20 May 2009)
Log Message:
-----------
Cleaned Fini
Modified Paths:
--------------
code/gazebo/trunk/server/Entity.cc
code/gazebo/trunk/server/rendering/OgreCreator.cc
Modified: code/gazebo/trunk/server/Entity.cc
===================================================================
--- code/gazebo/trunk/server/Entity.cc 2009-05-20 18:07:23 UTC (rev 7701)
+++ code/gazebo/trunk/server/Entity.cc 2009-05-20 18:22:48 UTC (rev 7702)
@@ -83,7 +83,9 @@
World::Instance()->GetPhysicsEngine()->RemoveEntity(this);
- OgreCreator::Instance()->DeleteVisual(this->visualNode);
+ if (this->visualNode)
+ OgreCreator::Instance()->DeleteVisual(this->visualNode);
+ this->visualNode = NULL;
}
////////////////////////////////////////////////////////////////////////////////
Modified: code/gazebo/trunk/server/rendering/OgreCreator.cc
===================================================================
--- code/gazebo/trunk/server/rendering/OgreCreator.cc 2009-05-20 18:07:23 UTC
(rev 7701)
+++ code/gazebo/trunk/server/rendering/OgreCreator.cc 2009-05-20 18:22:48 UTC
(rev 7702)
@@ -806,11 +806,11 @@
iter = this->visuals.find(visual->GetName());
- if (iter != this->visuals.end())
+ if (iter != this->visuals.end() && iter->second != NULL)
{
delete iter->second;
iter->second = NULL;
- this->visuals.erase(iter);
+ //this->visuals.erase(iter);
}
else
{
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Crystal Reports - New Free Runtime and 30 Day Trial
Check out the new simplified licensing option that enables
unlimited royalty-free distribution of the report engine
for externally facing server and web deployment.
http://p.sf.net/sfu/businessobjects
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
