Revision: 8501
http://playerstage.svn.sourceforge.net/playerstage/?rev=8501&view=rev
Author: natepak
Date: 2010-01-13 17:36:21 +0000 (Wed, 13 Jan 2010)
Log Message:
-----------
Fixed a minor bug with shutdown
Modified Paths:
--------------
code/gazebo/trunk/cmake/SearchForStuff.cmake
code/gazebo/trunk/server/physics/ode/ODEBody.cc
Modified: code/gazebo/trunk/cmake/SearchForStuff.cmake
===================================================================
--- code/gazebo/trunk/cmake/SearchForStuff.cmake 2010-01-13 16:37:42 UTC
(rev 8500)
+++ code/gazebo/trunk/cmake/SearchForStuff.cmake 2010-01-13 17:36:21 UTC
(rev 8501)
@@ -17,9 +17,9 @@
set (INCLUDE_WEBGAZEBO ON CACHE BOOL "Build webgazebo" FORCE)
set (OGRE_LIBRARY_PATH "/usr/local/lib" CACHE INTERNAL "Ogre library path")
-set (assimp_include_dirs "" CACHE STRING "Assimp include paths. Use this to
override automatic detection.")
-set (assimp_library_dirs "" CACHE STRING "Assimp library paths. Use this to
override automatic detection.")
-set (assimp_libraries "" CACHE STRING "Assimp libraries Use this to override
automatic detection.")
+set (assimp_include_dirs "" CACHE STRING "Assimp include paths. Use this to
override automatic detection." FORCE)
+set (assimp_library_dirs "" CACHE STRING "Assimp library paths. Use this to
override automatic detection." FORCE)
+set (assimp_libraries "" CACHE STRING "Assimp libraries Use this to override
automatic detection." FORCE)
set (boost_include_dirs "" CACHE STRING "Boost include paths. Use this to
override automatic detection.")
set (boost_library_dirs "" CACHE STRING "Boost library paths. Use this to
override automatic detection.")
@@ -347,15 +347,15 @@
# Find assimp
if (NOT assimp_include_dirs AND NOT assimp_library_dirs AND NOT
assimp_libraries )
- find_path(assimp_include_dir assimp.h ${assimp_include_dirs} ENV CPATH)
+ find_path(assimp_include_dir assimp.hpp ${assimp_include_dirs} ENV CPATH)
if (NOT assimp_include_dir)
#BUILD_ERROR("assimp not found. See the following website for installation
instructions: http://assimp.sourceforge.net";)
- message (STATUS "Looking for assimp.h - not found. Using built in
version.")
+ message (STATUS "Looking for assimp.hpp - not found. Using built in
version.")
set (assimp_include_dirs /usr/include CACHE STRING
"Assimp include paths. Use this to override automatic detection.")
else (NOT assimp_include_dir)
- message (STATUS "Looking for assimp.h - found")
+ message (STATUS "Looking for assimp.hpp - found")
set (assim_include_dirs ${assimp_include_dir} CACHE STRING
"Assimp include paths. Use this to override automatic detection.")
endif (NOT assimp_include_dir)
@@ -372,9 +372,9 @@
${assimp_library})
endif (NOT assimp_library)
- if (NOT assimp_include_dir AND NOT assimp_library)
+ if (NOT assimp_include_dir OR NOT assimp_library)
set (use_internal_assimp ON CACHE BOOL "Use internal assimp" FORCE)
- endif (NOT assimp_include_dir AND NOT assimp_library)
+ endif (NOT assimp_include_dir OR NOT assimp_library)
endif (NOT assimp_include_dirs AND NOT assimp_library_dirs AND NOT
assimp_libraries )
Modified: code/gazebo/trunk/server/physics/ode/ODEBody.cc
===================================================================
--- code/gazebo/trunk/server/physics/ode/ODEBody.cc 2010-01-13 16:37:42 UTC
(rev 8500)
+++ code/gazebo/trunk/server/physics/ode/ODEBody.cc 2010-01-13 17:36:21 UTC
(rev 8501)
@@ -65,7 +65,9 @@
// Destructor
ODEBody::~ODEBody()
{
- dBodyDestroy(this->bodyId);
+ if (this->bodyId)
+ dBodyDestroy(this->bodyId);
+ this->bodyId = NULL;
}
////////////////////////////////////////////////////////////////////////////////
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.Net email is sponsored by the Verizon Developer Community
Take advantage of Verizon's best-in-class app development support
A streamlined, 14 day to market process makes app distribution fast and easy
Join now and get one step closer to millions of Verizon customers
http://p.sf.net/sfu/verizon-dev2dev
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
