[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49996] trunk/blender/source/blender: fix for own commit r49991, this exposed bad logic in rect copy function.
Campbell Barton
ideasman42 at gmail.com
Sat Aug 18 22:54:43 CEST 2012
Revision: 49996
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49996
Author: campbellbarton
Date: 2012-08-18 20:54:43 +0000 (Sat, 18 Aug 2012)
Log Message:
-----------
fix for own commit r49991, this exposed bad logic in rect copy function.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49991
Modified Paths:
--------------
trunk/blender/source/blender/blenlib/BLI_rect.h
trunk/blender/source/blender/blenlib/intern/rct.c
trunk/blender/source/blender/editors/interface/interface.c
trunk/blender/source/blender/editors/interface/interface_handlers.c
trunk/blender/source/blender/editors/interface/interface_panel.c
trunk/blender/source/blender/editors/space_view3d/view3d_view.c
Modified: trunk/blender/source/blender/blenlib/BLI_rect.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_rect.h 2012-08-18 19:54:21 UTC (rev 49995)
+++ trunk/blender/source/blender/blenlib/BLI_rect.h 2012-08-18 20:54:43 UTC (rev 49996)
@@ -69,7 +69,8 @@
int BLI_rcti_isect(const struct rcti *src1, const struct rcti *src2, struct rcti *dest);
void BLI_rctf_union(struct rctf *rctf1, const struct rctf *rctf2);
void BLI_rcti_union(struct rcti *rcti1, const struct rcti *rcti2);
-void BLI_rcti_rctf_copy(struct rcti *tar, const struct rctf *src);
+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 print_rctf(const char *str, const struct rctf *rect);
void print_rcti(const char *str, const struct rcti *rect);
Modified: trunk/blender/source/blender/blenlib/intern/rct.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/rct.c 2012-08-18 19:54:21 UTC (rev 49995)
+++ trunk/blender/source/blender/blenlib/intern/rct.c 2012-08-18 20:54:43 UTC (rev 49996)
@@ -363,14 +363,22 @@
}
}
-void BLI_rcti_rctf_copy(rcti *tar, const rctf *src)
+void BLI_rcti_rctf_copy(rcti *dst, const rctf *src)
{
- tar->xmin = floorf(src->xmin + 0.5f);
- tar->xmax = floorf((src->xmax - src->xmin) + 0.5f);
- tar->ymin = floorf(src->ymin + 0.5f);
- tar->ymax = floorf((src->ymax - src->ymin) + 0.5f);
+ dst->xmin = floorf(src->xmin + 0.5f);
+ dst->xmax = dst->xmin + floorf((src->xmax - src->xmin) + 0.5f);
+ dst->ymin = floorf(src->ymin + 0.5f);
+ dst->ymax = dst->ymin + floorf((src->ymax - src->ymin) + 0.5f);
}
+void BLI_rctf_rcti_copy(rctf *dst, const rcti *src)
+{
+ dst->xmin = src->xmin;
+ dst->xmax = src->xmax;
+ dst->ymin = src->ymin;
+ dst->ymax = src->ymax;
+}
+
void print_rctf(const char *str, const rctf *rect)
{
printf("%s: xmin %.3f, xmax %.3f, ymin %.3f, ymax %.3f (%.3fx%.3f)\n", str,
Modified: trunk/blender/source/blender/editors/interface/interface.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface.c 2012-08-18 19:54:21 UTC (rev 49995)
+++ trunk/blender/source/blender/editors/interface/interface.c 2012-08-18 20:54:43 UTC (rev 49996)
@@ -137,10 +137,7 @@
ui_block_to_window_fl(ar, block, &tmpr.xmin, &tmpr.ymin);
ui_block_to_window_fl(ar, block, &tmpr.xmax, &tmpr.ymax);
- winr->xmin = tmpr.xmin;
- winr->ymin = tmpr.ymin;
- winr->xmax = tmpr.xmax;
- winr->ymax = tmpr.ymax;
+ BLI_rcti_rctf_copy(winr, &tmpr);
}
void ui_window_to_block_fl(const ARegion *ar, uiBlock *block, float *x, float *y) /* for mouse cursor */
Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_handlers.c 2012-08-18 19:54:21 UTC (rev 49995)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c 2012-08-18 20:54:43 UTC (rev 49996)
@@ -3347,9 +3347,8 @@
ui_mouse_scale_warp(data, mx, my, &mx_fl, &my_fl, shift);
- rect.xmin = but->rect.xmin; rect.xmax = but->rect.xmax;
- rect.ymin = but->rect.ymin; rect.ymax = but->rect.ymax;
-
+ BLI_rcti_rctf_copy(&rect, &but->rect);
+
ui_get_but_vectorf(but, rgb);
copy_v3_v3(hsv, ui_block_hsv_get(but->block));
rgb_to_hsv_compat_v(rgb, hsv);
@@ -3856,8 +3855,7 @@
int changed = 1;
float /* dx, */ dy; /* UNUSED */
- /* rect.xmin = but->rect.xmin; rect.xmax = but->rect.xmax; */
- /* rect.ymin = but->rect.ymin; rect.ymax = but->rect.ymax; */
+ /* BLI_rcti_rctf_copy(&rect, &but->rect); */
/* dx = mx - data->draglastx; */ /* UNUSED */
dy = my - data->draglasty;
@@ -3940,8 +3938,7 @@
int changed = 1;
float /* dx, */ dy /* , yfac=1.f */; /* UNUSED */
- /* rect.xmin = but->rect.xmin; rect.xmax = but->rect.xmax; */
- /* rect.ymin = but->rect.ymin; rect.ymax = but->rect.ymax; */
+ /* BLI_rcti_rctf_copy(&rect, &but->rect); */
/* dx = mx - data->draglastx; */ /* UNUSED */
dy = my - data->draglasty;
@@ -4024,8 +4021,7 @@
int changed = 1;
/* float dx, dy; */
- /* rect.xmin = but->rect.xmin; rect.xmax = but->rect.xmax; */
- /* rect.ymin = but->rect.ymin; rect.ymax = but->rect.ymax; */
+ /* BLI_rcti_rctf_copy(&rect, &but->rect); */
/* dx = mx - data->draglastx; */
/* dy = my - data->draglasty; */
@@ -5019,10 +5015,7 @@
ui_window_to_region(ar, &mx, &my);
/* make a copy of the mask rect, and tweak accordingly for hidden scrollbars */
- mask_rct.xmin = v2d->mask.xmin;
- mask_rct.xmax = v2d->mask.xmax;
- mask_rct.ymin = v2d->mask.ymin;
- mask_rct.ymax = v2d->mask.ymax;
+ mask_rct = v2d->mask;
if (v2d->scroll & (V2D_SCROLL_VERTICAL_HIDE | V2D_SCROLL_VERTICAL_FULLR)) {
if (v2d->scroll & V2D_SCROLL_LEFT)
Modified: trunk/blender/source/blender/editors/interface/interface_panel.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_panel.c 2012-08-18 19:54:21 UTC (rev 49995)
+++ trunk/blender/source/blender/editors/interface/interface_panel.c 2012-08-18 20:54:43 UTC (rev 49996)
@@ -422,7 +422,7 @@
glDisable(GL_BLEND);
}
-static void ui_draw_panel_dragwidget(rctf *rect)
+static void ui_draw_panel_dragwidget(const rctf *rect)
{
float xmin, xmax, dx;
float ymin, ymax, dy;
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_view.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_view.c 2012-08-18 19:54:21 UTC (rev 49995)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_view.c 2012-08-18 20:54:43 UTC (rev 49996)
@@ -1212,10 +1212,7 @@
rect.ymax = input->ymin + 12;
}
else {
- rect.xmin = input->xmin;
- rect.xmax = input->xmax;
- rect.ymin = input->ymin;
- rect.ymax = input->ymax;
+ BLI_rctf_rcti_copy(&rect, input);
}
setwinmatrixview3d(ar, v3d, &rect);
More information about the Bf-blender-cvs
mailing list