[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14321] trunk/blender/source/blender/ blenkernel/intern/particle_system.c:

[Brecht Van Lommel]

Revision: 14321
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14321
Author:   blendix
Date:     2008-04-03 00:18:32 +0200 (Thu, 03 Apr 2008)

Log Message:
-----------

Fix to make grass render the same on solaris as linux, by doing
pointer comparisons in qsort. This works for glibc according to
the documentation, and appears to work on solaris too.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/particle_system.c

Modified: trunk/blender/source/blender/blenkernel/intern/particle_system.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle_system.c    
2008-04-02 17:48:46 UTC (rev 14320)
+++ trunk/blender/source/blender/blenkernel/intern/particle_system.c    
2008-04-02 22:18:32 UTC (rev 14321)
@@ -845,8 +845,16 @@
 
        if(index1 < index2)
                return -1;
-       else if(index1 == index2)
-               return 0;
+       else if(index1 == index2) {
+               /* this pointer comparison appears to make qsort stable for 
glibc,
+                * and apparently on solaris too, makes the renders 
reproducable */
+               if(p1 < p2)
+                       return -1;
+               else if(p1 == p2)
+                       return 0;
+               else
+                       return 1;
+       }
        else
                return 1;
 }


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs