[Opende-svn] SF.net SVN: opende: [993] trunk/ode/src/collision_kernel.cpp

[<jas...@us...>]

Revision: 993
Author:   jason379
Date:     2006-06-17 08:01:53 -0700 (Sat, 17 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/opende/?rev=993&view=rev

Log Message:
-----------
Applied patch 1504084: dGeomSetBody(NULL) on plane should be allowed

Modified Paths:
--------------
    trunk/ode/src/collision_kernel.cpp
Modified: trunk/ode/src/collision_kernel.cpp
===================================================================
--- trunk/ode/src/collision_kernel.cpp	2006-06-17 14:59:27 UTC (rev 992)
+++ trunk/ode/src/collision_kernel.cpp	2006-06-17 15:01:53 UTC (rev 993)
@@ -409,7 +409,7 @@
 void dGeomSetBody (dxGeom *g, dxBody *b)
 {
   dAASSERT (g);
-  dUASSERT (g->gflags & GEOM_PLACEABLE,"geom must be placeable");
+  dUASSERT (b == NULL || (g->gflags & GEOM_PLACEABLE),"geom must be placeable");
   CHECK_NOT_LOCKED (g->parent_space);
 
   if (b) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.