[Bf-blender-cvs] [2927fa4] master: correct own error in rectangle clamping

[Campbell Barton]

Commit: 2927fa4450a9bb8341e11eb6d61773d778b8c390
Author: Campbell Barton
Date:   Sat Oct 17 18:52:05 2015 +1100
Branches: master
https://developer.blender.org/rB2927fa4450a9bb8341e11eb6d61773d778b8c390

correct own error in rectangle clamping

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

M	source/blender/blenlib/intern/rct.c

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

diff --git a/source/blender/blenlib/intern/rct.c b/source/blender/blenlib/intern/rct.c
index 600ae6b..a5f7fe2 100644
--- a/source/blender/blenlib/intern/rct.c
+++ b/source/blender/blenlib/intern/rct.c
@@ -508,8 +508,8 @@ bool BLI_rctf_clamp(rctf *rect, const rctf *rect_bounds, float r_xy[2])
 
 	if (rect->xmin < rect_bounds->xmin) {
 		float ofs = rect_bounds->xmin - rect->xmin;
-		rect->xmin += r_xy[0];
-		rect->xmax += r_xy[0];
+		rect->xmin += ofs;
+		rect->xmax += ofs;
 		r_xy[0] += ofs;
 		changed = true;
 	}
@@ -524,8 +524,8 @@ bool BLI_rctf_clamp(rctf *rect, const rctf *rect_bounds, float r_xy[2])
 
 	if (rect->ymin < rect_bounds->ymin) {
 		float ofs = rect_bounds->ymin - rect->ymin;
-		rect->ymin += r_xy[1];
-		rect->ymax += r_xy[1];
+		rect->ymin += ofs;
+		rect->ymax += ofs;
 		r_xy[1] += ofs;
 		changed = true;
 	}
@@ -550,8 +550,8 @@ bool BLI_rcti_clamp(rcti *rect, const rcti *rect_bounds, int r_xy[2])
 
 	if (rect->xmin < rect_bounds->xmin) {
 		int ofs = rect_bounds->xmin - rect->xmin;
-		rect->xmin += r_xy[0];
-		rect->xmax += r_xy[0];
+		rect->xmin += ofs;
+		rect->xmax += ofs;
 		r_xy[0] += ofs;
 		changed = true;
 	}
@@ -566,8 +566,8 @@ bool BLI_rcti_clamp(rcti *rect, const rcti *rect_bounds, int r_xy[2])
 
 	if (rect->ymin < rect_bounds->ymin) {
 		int ofs = rect_bounds->ymin - rect->ymin;
-		rect->ymin += r_xy[1];
-		rect->ymax += r_xy[1];
+		rect->ymin += ofs;
+		rect->ymax += ofs;
 		r_xy[1] += ofs;
 		changed = true;
 	}