[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14595] trunk/blender/source/blender/src:

Brecht Van Lommel brechtvanlommel at pandora.be
Mon Apr 28 15:34:00 CEST 2008


Revision: 14595
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14595
Author:   blendix
Date:     2008-04-28 15:33:52 +0200 (Mon, 28 Apr 2008)

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

Fix for bug #9652: "draw zbuffer values" in the image editor did
not work correct.

Modified Paths:
--------------
    trunk/blender/source/blender/src/drawimage.c
    trunk/blender/source/blender/src/header_image.c

Modified: trunk/blender/source/blender/src/drawimage.c
===================================================================
--- trunk/blender/source/blender/src/drawimage.c	2008-04-28 12:26:41 UTC (rev 14594)
+++ trunk/blender/source/blender/src/drawimage.c	2008-04-28 13:33:52 UTC (rev 14595)
@@ -2238,7 +2238,7 @@
 							else if(ibuf->rect_float && ibuf->channels==4)
 								sima_draw_alpha_pixelsf(x1_rep, y1_rep, ibuf->x, ibuf->y, ibuf->rect_float);
 						}
-						else if(sima->flag & SI_SHOW_ZBUF && ((ibuf->zbuf || ibuf->zbuf_float || (ibuf->channels==1)) == 0)) {
+						else if(sima->flag & SI_SHOW_ZBUF && (ibuf->zbuf || ibuf->zbuf_float || (ibuf->channels==1))) {
 							if(ibuf->zbuf)
 								sima_draw_zbuf_pixels(x1_rep, y1_rep, ibuf->x, ibuf->y, ibuf->zbuf);
 							else if(ibuf->zbuf_float)

Modified: trunk/blender/source/blender/src/header_image.c
===================================================================
--- trunk/blender/source/blender/src/header_image.c	2008-04-28 12:26:41 UTC (rev 14594)
+++ trunk/blender/source/blender/src/header_image.c	2008-04-28 13:33:52 UTC (rev 14595)
@@ -1286,7 +1286,7 @@
 		}
 		if(ibuf) {
 			if(ibuf->zbuf || ibuf->zbuf_float || (ibuf->channels==1)) {
-				uiDefIconButBitI(block, TOG, SI_SHOW_ZBUF, B_SIMA_SHOW_ZBUF, ICON_SOLID, xco,0,XIC,YIC, &G.sima->flag, 0, 0, 0, 0, "Draws zbuffer values");
+				uiDefIconButBitI(block, TOG, SI_SHOW_ZBUF, B_SIMA_SHOW_ZBUF, ICON_SOLID, xco,0,XIC,YIC, &G.sima->flag, 0, 0, 0, 0, "Draws zbuffer values (mapped from camera clip start to end)");
 				xco+= XIC;
 			}
 		}		





More information about the Bf-blender-cvs mailing list