[Opende-svn] SF.net SVN: opende:[1811] branches/islandThreads

[<hsu...@us...>]

Revision: 1811
          http://opende.svn.sourceforge.net/opende/?rev=1811&view=rev
Author:   hsujohnhsu
Date:     2011-05-25 22:11:13 +0000 (Wed, 25 May 2011)

Log Message:
-----------
merging from trunk

Modified Paths:
--------------
    branches/islandThreads/CHANGELOG.txt
    branches/islandThreads/libccd/bootstrap
    branches/islandThreads/ode/src/step.cpp

Property Changed:
----------------
    branches/islandThreads/


Property changes on: branches/islandThreads
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:1774-1792
   + /trunk:1774-1810

Modified: branches/islandThreads/CHANGELOG.txt
===================================================================
--- branches/islandThreads/CHANGELOG.txt	2011-05-18 08:47:10 UTC (rev 1810)
+++ branches/islandThreads/CHANGELOG.txt	2011-05-25 22:11:13 UTC (rev 1811)
@@ -8,6 +8,10 @@
   * keep the format consistent (79 char width, M/D/Y date format).
 
 ------------------------------------------------------------------------------
+05/17/11 Oleh Derevenko
+		* A typo in step.cpp fixed (assignment operator in a conditional 
+		  instead of comparison) (reported by Bram Stolk)
+
 01/29/11 Oleh Derevenko
 		* Heightfield zone boundaries calculation code fixed to also consider
 		  whole next cell after the AABB if the AABB ends exactly at the cell

Modified: branches/islandThreads/libccd/bootstrap
===================================================================
--- branches/islandThreads/libccd/bootstrap	2011-05-18 08:47:10 UTC (rev 1810)
+++ branches/islandThreads/libccd/bootstrap	2011-05-25 22:11:13 UTC (rev 1811)
@@ -1,6 +1,11 @@
 #!/bin/sh
 
-libtoolize -f -c
+# on Mac libtoolize is called glibtoolize
+LIBTOOLIZE=libtoolize
+if [ `uname -s` = Darwin ]; then
+    LIBTOOLIZE=glibtoolize
+fi
+$LIBTOOLIZE -f -c --automake
 aclocal
 autoheader -f
 autoconf

Modified: branches/islandThreads/ode/src/step.cpp
===================================================================
--- branches/islandThreads/ode/src/step.cpp	2011-05-18 08:47:10 UTC (rev 1810)
+++ branches/islandThreads/ode/src/step.cpp	2011-05-25 22:11:13 UTC (rev 1811)
@@ -366,7 +366,7 @@
               jicurr->joint = j;
               --jicurr;
             } else if (jicurr->info.nub > 0) { // A mixed case
-              if (mix_end = lcp_end) { // no lcp infos yet - just move to opposite side of mixed-s
+              if (mix_end == lcp_end) { // no lcp infos yet - just move to opposite side of mixed-s
                 dJointWithInfo1 *jimixend = jointiinfos + mix_end;
                 lcp_end = mix_end = mix_end + 1;
                 jimixend->info = jicurr->info;


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