[Bf-blender-cvs] [e140024] master: Fix for off-by-one regression in D41

Campbell Barton noreply at git.blender.org
Tue Dec 10 12:20:52 CET 2013


Commit: e140024f2e79bc3637f44ee316d6e96c69a2e100
Author: Campbell Barton
Date:   Tue Dec 10 22:19:17 2013 +1100
http://developer.blender.org/rBe140024f2e79bc3637f44ee316d6e96c69a2e100

Fix for off-by-one regression in D41

making the window larger was using incorrect factor leaving a black bar
on the window edge.

===================================================================

M	source/blender/editors/screen/screen_edit.c

===================================================================

diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c
index 5c0bcab..876c054 100644
--- a/source/blender/editors/screen/screen_edit.c
+++ b/source/blender/editors/screen/screen_edit.c
@@ -686,10 +686,8 @@ static void screen_test_scale(bScreen *sc, int winsizex, int winsizey)
 	sizey = max[1] - min[1] + 1;
 	
 	if (sizex != winsizex || sizey != winsizey) {
-		facx = winsizex;
-		facx /= (float)sizex;
-		facy = winsizey;
-		facy /= (float)sizey;
+		facx = ((float)winsizex) / ((float)sizex - 1);
+		facy = ((float)winsizey) / ((float)sizey - 1);
 		
 		/* make sure it fits! */
 		for (sv = sc->vertbase.first; sv; sv = sv->next) {




More information about the Bf-blender-cvs mailing list