diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-09-15 11:42:30 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-09-15 11:42:30 +0400 |
commit | 5dbd603363c3f4f91b627b759c9992efc2a0ada8 (patch) | |
tree | 1a4aa6d16795648cb0d65b3686d21406006196c8 /source/blender/editors | |
parent | fed6b2bcb75a0d67d1b1266fd13d9a4b89dd1923 (diff) |
code cleanup: remove more invalid/paranoid NULL checks
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/interface/interface_regions.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c index 10a64d50887..59fa66b12af 100644 --- a/source/blender/editors/interface/interface_regions.c +++ b/source/blender/editors/interface/interface_regions.c @@ -1494,7 +1494,7 @@ static void ui_block_position(wmWindow *window, ARegion *butregion, uiBut *but, BLI_rctf_translate(&block->rect, xof, yof); /* safety calculus */ - if (but) { + { const float midx = BLI_RCT_CENTER_X(&butrct); const float midy = BLI_RCT_CENTER_Y(&butrct); @@ -1521,20 +1521,13 @@ static void ui_block_position(wmWindow *window, ARegion *butregion, uiBut *but, } block->direction = dir1; } - else { - block->safety.xmin = block->rect.xmin - 40; - block->safety.ymin = block->rect.ymin - 40; - block->safety.xmax = block->rect.xmax + 40; - block->safety.ymax = block->rect.ymax + 40; - } /* keep a list of these, needed for pulldown menus */ saferct = MEM_callocN(sizeof(uiSafetyRct), "uiSafetyRct"); saferct->parent = butrct; saferct->safety = block->safety; BLI_freelistN(&block->saferct); - if (but) - BLI_duplicatelist(&block->saferct, &but->block->saferct); + BLI_duplicatelist(&block->saferct, &but->block->saferct); BLI_addhead(&block->saferct, saferct); } |