[Opende-svn] SF.net SVN: opende:[1921] trunk

[<ole...@us...>]

Revision: 1921
          http://opende.svn.sourceforge.net/opende/?rev=1921&view=rev
Author:   oleh_derevenko
Date:     2012-12-28 09:57:39 +0000 (Fri, 28 Dec 2012)
Log Message:
-----------
Fixed:  A bug with heightfield data assigned to a wrong field in dGeomHeightfieldSetHeightfieldData fixed (bug report #88 by Luc).

Modified Paths:
--------------
    trunk/CHANGELOG.txt
    trunk/ode/src/heightfield.cpp

Modified: trunk/CHANGELOG.txt
===================================================================
--- trunk/CHANGELOG.txt	2012-12-26 10:17:08 UTC (rev 1920)
+++ trunk/CHANGELOG.txt	2012-12-28 09:57:39 UTC (rev 1921)
@@ -8,11 +8,16 @@
   * keep the format consistent (79 char width, M/D/Y date format).
 
 ------------------------------------------------------------------------------
+12/28/12 Oleh_Derevenko
+        * A bug with heightfield data assigned to a wrong field in 
+          dGeomHeightfieldSetHeightfieldData fixed (bug report #88 by Luc).
+
 12/18/12 Oleh_Derevenko
         * Fixed issue with some kinds of joints (Ball, DBall, DHinge, Fixed)
           might overwrite world ERP value with their custom ERP during 
           getInfo2() call and that inappropriate value would then be passed 
           to subsequent joints in solver instead of world ERP.
+
 12/01/12 Oleh_Derevenko
         * Fixed issues reported in patches #151 and #22 (collisions with
           SAPSpace and QuadTreeSpace might not work because geometries list

Modified: trunk/ode/src/heightfield.cpp
===================================================================
--- trunk/ode/src/heightfield.cpp	2012-12-26 10:17:08 UTC (rev 1920)
+++ trunk/ode/src/heightfield.cpp	2012-12-28 09:57:39 UTC (rev 1921)
@@ -892,7 +892,7 @@
 void dGeomHeightfieldSetHeightfieldData( dGeomID g, dHeightfieldDataID d )
 {
     dxHeightfield* geom = (dxHeightfield*) g;
-    geom->data = d;
+    geom->m_p_data = d;
 }
 
 

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