[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11652] branches/soc-2007-joeedh/source/ blender/render/intern/source/zbuf.c: oops problem in last commit.

[Joseph Eagar]

Revision: 11652
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11652
Author:   joeedh
Date:     2007-08-18 07:09:33 +0200 (Sat, 18 Aug 2007)

Log Message:
-----------
oops problem in last commit.

Modified Paths:
--------------
    branches/soc-2007-joeedh/source/blender/render/intern/source/zbuf.c

Modified: branches/soc-2007-joeedh/source/blender/render/intern/source/zbuf.c
===================================================================
--- branches/soc-2007-joeedh/source/blender/render/intern/source/zbuf.c	2007-08-18 05:03:18 UTC (rev 11651)
+++ branches/soc-2007-joeedh/source/blender/render/intern/source/zbuf.c	2007-08-18 05:09:33 UTC (rev 11652)
@@ -3775,7 +3775,8 @@
 	rdrect= pa.rectdaps;
 
 	mergescratchlen = sizeof(_ClrEntry) > sizeof(DSMLayerSample) ? sizeof(_ClrEntry)*dbuf->max_depth : sizeof(DSMLayerSample)*dbuf->max_depth;
-	mergescratch = (char*) row = MEM_mapallocN(mergescratchlen, "mergescratch in zbuf.c");
+	mergescratch = MEM_mapallocN(mergescratchlen, "mergescratch in zbuf.c");
+	row = (_ClrEntry*) mergescratch;
 
 	/* render the tile */
 	for(y=0; y<pa.recty; y++) {