[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11499] trunk/blender/source/blender/src/ drawimage.c:
Brecht Van Lommel
brechtvanlommel at pandora.be
Mon Aug 6 02:51:17 CEST 2007
Revision: 11499
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11499
Author: blendix
Date: 2007-08-06 02:51:17 +0200 (Mon, 06 Aug 2007)
Log Message:
-----------
Fix for bug #6977:
Drawing float images with the tiles option crashed.
Modified Paths:
--------------
trunk/blender/source/blender/src/drawimage.c
Modified: trunk/blender/source/blender/src/drawimage.c
===================================================================
--- trunk/blender/source/blender/src/drawimage.c 2007-08-06 00:38:29 UTC (rev 11498)
+++ trunk/blender/source/blender/src/drawimage.c 2007-08-06 00:51:17 UTC (rev 11499)
@@ -1641,6 +1641,10 @@
glPixelZoom((float)sima->zoom, (float)sima->zoom);
if(sima->flag & SI_EDITTILE) {
+ /* create char buffer from float if needed */
+ if(ibuf->rect_float && ibuf->rect==NULL)
+ IMB_rect_from_float(ibuf);
+
glaDrawPixelsSafe(x1, y1, ibuf->x, ibuf->y, ibuf->x, GL_RGBA, GL_UNSIGNED_BYTE, ibuf->rect);
glPixelZoom(1.0, 1.0);
@@ -1681,6 +1685,10 @@
sx*= dx;
sy*= dy;
+ /* create char buffer from float if needed */
+ if(ibuf->rect_float && ibuf->rect==NULL)
+ IMB_rect_from_float(ibuf);
+
rect= get_part_from_ibuf(ibuf, sx, sy, sx+dx, sy+dy);
/* rect= ibuf->rect; */
More information about the Bf-blender-cvs
mailing list