[Bf-blender-cvs] [166408c] master: UI cleanup: removing if, condition was already tested

Ines Almeida noreply at git.blender.org
Fri May 29 10:46:16 CEST 2015


Commit: 166408cfe2767bb783a651ddf7ca048dc121a71b
Author: Ines Almeida
Date:   Fri May 29 09:27:23 2015 +0100
Branches: master
https://developer.blender.org/rB166408cfe2767bb783a651ddf7ca048dc121a71b

UI cleanup: removing if, condition was already tested

===================================================================

M	source/blender/editors/interface/interface_regions.c

===================================================================

diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c
index 3f0dac5..3f323de 100644
--- a/source/blender/editors/interface/interface_regions.c
+++ b/source/blender/editors/interface/interface_regions.c
@@ -1045,14 +1045,8 @@ static void ui_searchbox_region_draw_cb(const bContext *UNUSED(C), ARegion *ar)
 				ui_searchbox_butrect(&rect, data, a);
 				
 				/* widget itself */
-				if (data->preview) {
-					ui_draw_preview_item(&data->fstyle, &rect, data->items.names[a], data->items.icons[a],
-					                     (a == data->active) ? UI_ACTIVE : 0);
-				}
-				else {
-					ui_draw_menu_item(&data->fstyle, &rect, data->items.names[a], data->items.icons[a],
-					                  (a == data->active) ? UI_ACTIVE : 0, data->use_sep);
-				}
+				ui_draw_preview_item(&data->fstyle, &rect, data->items.names[a], data->items.icons[a],
+				                     (a == data->active) ? UI_ACTIVE : 0);
 			}
 			
 			/* indicate more */




More information about the Bf-blender-cvs mailing list