[fusion-commits] Animation plugin: Changes to 'master' (4fb00729ceef5a0e257ba589d9d635eae36d67b6)

[cornelius at server.opencompositing.org]

New commits:
commit 4fb00729ceef5a0e257ba589d9d635eae36d67b6
Merge: a95ae390fd690c8510df17aee6fb63cd3f6168cf 762e18cb534b52607a8bbd0d947902134cc6644b
Author: Erkin Bahceci <erkinbah at gmail.com>
Date:   Fri Mar 14 00:49:26 2008 -0500

    Merge branch 'master' of git+ssh://cornelius@git.opencompositing.org/git/fusion/plugins/animation

commit a95ae390fd690c8510df17aee6fb63cd3f6168cf
Author: Erkin Bahceci <erkinbah at gmail.com>
Date:   Fri Mar 14 00:47:27 2008 -0500

    Fix crash due to last commit (e.g. with razr).


 animation.c |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)


Modified: fusion/plugins/animation/animation.c
===================================================================
--- fusion/plugins/animation/animation.c
+++ fusion/plugins/animation/animation.c
@@ -2385,25 +2385,27 @@ animAddWindowGeometry(CompWindow * w,
 	    if (w->vCount == 0)	// if there is no vertex
 	    {
 		// put a dummy quad in vertices and indices
+
+		w->texUnits = 1;
+		w->texCoordSize = 4;
+		vSize = 3 + w->texUnits * w->texCoordSize;
+
 		if (4 > w->indexSize)
 		{
 		    if (!moreWindowIndices(w, 4))
 			return;
 		}
-		if (4 > w->vertexSize)
+		if (4 * vSize > w->vertexSize)
 		{
-		    if (!moreWindowVertices(w, 4))
+		    if (!moreWindowVertices(w, 4 * vSize))
 			return;
 		}
 		w->vCount = 4;
 		w->indexCount = 4;
-
-		w->texUnits = 1;
-		w->texCoordSize = 4;
-		w->vertexStride = 3 + w->texUnits * w->texCoordSize;
+		w->vertexStride = vSize;
 
 		// Clear dummy quad coordinates/indices
-		memset(w->vertices, 0, sizeof(GLfloat) * w->vertexStride * 4);
+		memset(w->vertices, 0, sizeof(GLfloat) * 4 * vSize);
 		memset(w->indices, 0, sizeof(GLushort) * 4);
 	    }
 	    return;				// We're done here.