[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16114] branches/apricot/source/gameengine /Rasterizer/RAS_BucketManager.cpp: Apricot branch: a fix for flickering alpha, with multi-material

[Brecht Van Lommel]

Revision: 16114
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16114
Author:   blendix
Date:     2008-08-14 19:12:40 +0200 (Thu, 14 Aug 2008)

Log Message:
-----------
Apricot branch: a fix for flickering alpha, with multi-material
objects. Note that sorting is only between polygons with the same
material, so which material draws first is still arbitrary, but
consistent.

Modified Paths:
--------------
    branches/apricot/source/gameengine/Rasterizer/RAS_BucketManager.cpp

Modified: branches/apricot/source/gameengine/Rasterizer/RAS_BucketManager.cpp
===================================================================
--- branches/apricot/source/gameengine/Rasterizer/RAS_BucketManager.cpp	2008-08-14 17:09:39 UTC (rev 16113)
+++ branches/apricot/source/gameengine/Rasterizer/RAS_BucketManager.cpp	2008-08-14 17:12:40 UTC (rev 16114)
@@ -69,7 +69,7 @@
 {
 	bool operator()(const sortedmeshslot &a, const sortedmeshslot &b)
 	{
-		return a.m_z < b.m_z;
+		return (a.m_z < b.m_z) || (a.m_z == b.m_z && a.m_ms < b.m_ms);
 	}
 };
 
@@ -77,7 +77,7 @@
 {
 	bool operator()(const sortedmeshslot &a, const sortedmeshslot &b)
 	{
-		return a.m_z > b.m_z;
+		return (a.m_z > b.m_z) || (a.m_z == b.m_z && a.m_ms > b.m_ms);
 	}
 };