[Bf-blender-cvs] [bddb4de47cd] master: Fix T51845

[raa]

Commit: bddb4de47cd6c40c94a1104f6c35528cd26c4d9b
Author: raa
Date:   Fri Jun 23 11:04:58 2017 +0300
Branches: master
https://developer.blender.org/rBbddb4de47cd6c40c94a1104f6c35528cd26c4d9b

Fix T51845

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

M       source/blender/blenlib/BLI_rect.h
M       source/blender/blenlib/intern/rct.c
M       source/blender/editors/interface/interface.c

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

diff --git a/source/blender/blenlib/BLI_rect.h 
b/source/blender/blenlib/BLI_rect.h
index 041679ef876..21b9c75ac35 100644
--- a/source/blender/blenlib/BLI_rect.h
+++ b/source/blender/blenlib/BLI_rect.h
@@ -97,6 +97,7 @@ void BLI_rctf_union(struct rctf *rctf1, const struct rctf 
*rctf2);
 void BLI_rcti_rctf_copy(struct rcti *dst, const struct rctf *src);
 void BLI_rctf_rcti_copy(struct rctf *dst, const struct rcti *src);
 void BLI_rcti_rctf_copy_floor(struct rcti *dst, const struct rctf *src);
+void BLI_rcti_rctf_copy_round(struct rcti *dst, const struct rctf *src);
 
 void BLI_rctf_rotate_expand(rctf *dst, const rctf *src, const float angle);
 
diff --git a/source/blender/blenlib/intern/rct.c 
b/source/blender/blenlib/intern/rct.c
index fd24a00156d..e0c4cbe9990 100644
--- a/source/blender/blenlib/intern/rct.c
+++ b/source/blender/blenlib/intern/rct.c
@@ -693,6 +693,14 @@ void BLI_rcti_rctf_copy_floor(rcti *dst, const rctf *src)
        dst->ymax = floorf(src->ymax);
 }
 
+void BLI_rcti_rctf_copy_round(rcti *dst, const rctf *src)
+{
+       dst->xmin = floorf(src->xmin + 0.5f);
+       dst->xmax = floorf(src->xmax + 0.5f);
+       dst->ymin = floorf(src->ymin + 0.5f);
+       dst->ymax = floorf(src->ymax + 0.5f);
+}
+
 void BLI_rctf_rcti_copy(rctf *dst, const rcti *src)
 {
        dst->xmin = src->xmin;
diff --git a/source/blender/editors/interface/interface.c 
b/source/blender/editors/interface/interface.c
index 64b26406f84..2ebdf6d214e 100644
--- a/source/blender/editors/interface/interface.c
+++ b/source/blender/editors/interface/interface.c
@@ -1337,7 +1337,7 @@ static void ui_but_to_pixelrect(rcti *rect, const ARegion 
*ar, uiBlock *block, u
        rctf rectf;
 
        ui_block_to_window_rctf(ar, block, &rectf, (but) ? &but->rect : 
&block->rect);
-       BLI_rcti_rctf_copy(rect, &rectf);
+       BLI_rcti_rctf_copy_round(rect, &rectf);
        BLI_rcti_translate(rect, -ar->winrct.xmin, -ar->winrct.ymin);
 }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs