[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55154] trunk/blender/source/blender/ editors/screen/glutil.c: patch [#34586] Variable typo in glaDrawPixelsTexScaled
Campbell Barton
ideasman42 at gmail.com
Sun Mar 10 08:01:52 CET 2013
Revision: 55154
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55154
Author: campbellbarton
Date: 2013-03-10 07:01:52 +0000 (Sun, 10 Mar 2013)
Log Message:
-----------
patch [#34586] Variable typo in glaDrawPixelsTexScaled
from Andre D (andred)
xzoom was used where yzoom was meant to be used. Caused issues when xzoom and yzoom were not the same value.
Modified Paths:
--------------
trunk/blender/source/blender/editors/screen/glutil.c
Modified: trunk/blender/source/blender/editors/screen/glutil.c
===================================================================
--- trunk/blender/source/blender/editors/screen/glutil.c 2013-03-10 06:40:19 UTC (rev 55153)
+++ trunk/blender/source/blender/editors/screen/glutil.c 2013-03-10 07:01:52 UTC (rev 55154)
@@ -560,10 +560,10 @@
glEnable(GL_TEXTURE_2D);
glBegin(GL_QUADS);
glTexCoord2f((float)(0 + offset_left) / tex_w, (float)(0 + offset_bot) / tex_h);
- glVertex2f(rast_x + (float)offset_left * xzoom, rast_y + (float)offset_bot * xzoom);
+ glVertex2f(rast_x + (float)offset_left * xzoom, rast_y + (float)offset_bot * yzoom);
glTexCoord2f((float)(subpart_w - offset_right) / tex_w, (float)(0 + offset_bot) / tex_h);
- glVertex2f(rast_x + (float)(subpart_w - offset_right) * xzoom * scaleX, rast_y + (float)offset_bot * xzoom);
+ glVertex2f(rast_x + (float)(subpart_w - offset_right) * xzoom * scaleX, rast_y + (float)offset_bot * yzoom);
glTexCoord2f((float)(subpart_w - offset_right) / tex_w, (float)(subpart_h - offset_top) / tex_h);
glVertex2f(rast_x + (float)(subpart_w - offset_right) * xzoom * scaleX, rast_y + (float)(subpart_h - offset_top) * yzoom * scaleY);
More information about the Bf-blender-cvs
mailing list