diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-04-21 17:11:51 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-04-21 17:11:51 +0400 |
commit | 210ee1ade4b4ec5b6f2d3710986171a21a4b8604 (patch) | |
tree | 86e27af39ba932f043da2b73463651ff2e40d41c /source/blender/editors/interface | |
parent | 2e9982f420cab3b2ecf4648c0a91403f757ef9fe (diff) |
whitespace only, no functional change mixed tabs/spaces --> tabs.v2.57a
Diffstat (limited to 'source/blender/editors/interface')
-rw-r--r-- | source/blender/editors/interface/interface.c | 4 | ||||
-rw-r--r-- | source/blender/editors/interface/interface_layout.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index 1495d2b00ba..b07baf45d23 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -370,7 +370,7 @@ static void ui_popup_bounds_block(const bContext *C, uiBlock *block, int bounds_ /* and we adjust the position to fit within window */ width= block->maxx - block->minx; height= block->maxy - block->miny; - + /* avoid divide by zero below, caused by calling with no UI, but better not crash */ oldwidth= oldwidth > 0 ? oldwidth : MAX2(1, width); oldheight= oldheight > 0 ? oldheight : MAX2(1, height); @@ -1284,7 +1284,7 @@ double ui_get_but_val(uiBut *but) else if( but->pointype == FLO ) { value= *(float *)but->poin; } - + return value; } diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c index a208eee1649..7dc27805b40 100644 --- a/source/blender/editors/interface/interface_layout.c +++ b/source/blender/editors/interface/interface_layout.c @@ -1196,10 +1196,10 @@ static void rna_search_cb(const struct bContext *C, void *arg_but, const char *s #endif name= BLI_strdup(name_ui); iconid= ui_id_icon_get((bContext*)C, id, 1); - } + } else { name= RNA_struct_name_get_alloc(&itemptr, NULL, 0); - iconid = 0; + iconid = 0; } if(name) { |