[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42713] trunk/blender/source/blender/ editors/interface/interface_regions.c: remove unneeded NULL check in ui_searchbox_create() which confuses static checkers since the values used later.
Campbell Barton
ideasman42 at gmail.com
Sun Dec 18 23:42:44 CET 2011
Revision: 42713
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42713
Author: campbellbarton
Date: 2011-12-18 22:42:43 +0000 (Sun, 18 Dec 2011)
Log Message:
-----------
remove unneeded NULL check in ui_searchbox_create() which confuses static checkers since the values used later.
Modified Paths:
--------------
trunk/blender/source/blender/editors/interface/interface_regions.c
Modified: trunk/blender/source/blender/editors/interface/interface_regions.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_regions.c 2011-12-18 22:35:52 UTC (rev 42712)
+++ trunk/blender/source/blender/editors/interface/interface_regions.c 2011-12-18 22:42:43 UTC (rev 42713)
@@ -1071,18 +1071,16 @@
/* copy to int, gets projected if possible too */
x1= x1f; y1= y1f; x2= x2f; y2= y2f;
- if(butregion) {
- if(butregion->v2d.cur.xmin != butregion->v2d.cur.xmax) {
- UI_view2d_to_region_no_clip(&butregion->v2d, x1f, y1f, &x1, &y1);
- UI_view2d_to_region_no_clip(&butregion->v2d, x2f, y2f, &x2, &y2);
- }
-
- x1 += butregion->winrct.xmin;
- x2 += butregion->winrct.xmin;
- y1 += butregion->winrct.ymin;
- y2 += butregion->winrct.ymin;
+ if(butregion->v2d.cur.xmin != butregion->v2d.cur.xmax) {
+ UI_view2d_to_region_no_clip(&butregion->v2d, x1f, y1f, &x1, &y1);
+ UI_view2d_to_region_no_clip(&butregion->v2d, x2f, y2f, &x2, &y2);
}
-
+
+ x1 += butregion->winrct.xmin;
+ x2 += butregion->winrct.xmin;
+ y1 += butregion->winrct.ymin;
+ y2 += butregion->winrct.ymin;
+
wm_window_get_size(CTX_wm_window(C), &winx, &winy);
if(x2 > winx) {
@@ -1096,7 +1094,8 @@
x2= winx;
}
}
- if(y1 < 0) { /* XXX butregion NULL check?, there is one above */
+
+ if(y1 < 0) {
int newy1;
UI_view2d_to_region_no_clip(&butregion->v2d, 0, but->y2 + ofsy, NULL, &newy1);
newy1 += butregion->winrct.ymin;
More information about the Bf-blender-cvs
mailing list