Revision: 23857
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23857
Author: blendix
Date: 2009-10-15 11:56:10 +0200 (Thu, 15 Oct 2009)
Log Message:
-----------
Bugfix: deep shadow buffer commit made mixed solid/ztransp rendering
not work correct without OSA.
Modified Paths:
--------------
trunk/blender/source/blender/render/intern/source/zbuf.c
Modified: trunk/blender/source/blender/render/intern/source/zbuf.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/zbuf.c 2009-10-15
09:00:40 UTC (rev 23856)
+++ trunk/blender/source/blender/render/intern/source/zbuf.c 2009-10-15
09:56:10 UTC (rev 23857)
@@ -3181,17 +3181,21 @@
int x, y, *rza, *rma;
intptr_t *rd;
- if((R.osa==0 && !pa->rectz) || !pa->rectdaps) {
- fillrect(arectz, pa->rectx, pa->recty, 0x7FFFFFFE);
- return;
- }
+ if(R.osa==0) {
+ if(!pa->rectz)
+ fillrect(arectz, pa->rectx, pa->recty, 0x7FFFFFFE);
+ else
+ memcpy(arectz, pa->rectz,
sizeof(int)*pa->rectx*pa->recty);
- if(R.osa==0) {
- memcpy(arectz, pa->rectz, sizeof(int)*pa->rectx*pa->recty);
if(rectmask && pa->rectmask)
memcpy(rectmask, pa->rectmask,
sizeof(int)*pa->rectx*pa->recty);
+
return;
}
+ else if(!pa->rectdaps) {
+ fillrect(arectz, pa->rectx, pa->recty, 0x7FFFFFFE);
+ return;
+ }
rza= arectz;
rma= rectmask;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs