Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

remove unneeded NULL check in ui_searchbox_create() which confuses static checkers since the values used later.

Browse Source
This commit is contained in:
Campbell Barton
2011-12-18 22:42:43 +00:00
parent 65f2cbdd0f
commit 32896bbf59
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
source/blender/editors/interface/interface_regions.c
View File

@@ -1071,18 +1071,16 @@ ARegion *ui_searchbox_create(bContext *C, ARegion *butregion, uiBut *but)
/* copy to int, gets projected if possible too */ /* copy to int, gets projected if possible too */
x1= x1f; y1= y1f; x2= x2f; y2= y2f; x1= x1f; y1= y1f; x2= x2f; y2= y2f;
if(butregion) { if(butregion->v2d.cur.xmin != butregion->v2d.cur.xmax) {
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, x1f, y1f, &x1, &y1); UI_view2d_to_region_no_clip(&butregion->v2d, x2f, y2f, &x2, &y2);
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;
} }
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); wm_window_get_size(CTX_wm_window(C), &winx, &winy);
if(x2 > winx) { if(x2 > winx) {
@@ -1096,7 +1094,8 @@ ARegion *ui_searchbox_create(bContext *C, ARegion *butregion, uiBut *but)
x2= winx; x2= winx;
} }
} }
if(y1 < 0) { /* XXX butregion NULL check?, there is one above */
if(y1 < 0) {
int newy1; int newy1;
UI_view2d_to_region_no_clip(&butregion->v2d, 0, but->y2 + ofsy, NULL, &newy1); UI_view2d_to_region_no_clip(&butregion->v2d, 0, but->y2 + ofsy, NULL, &newy1);
newy1 += butregion->winrct.ymin; newy1 += butregion->winrct.ymin;