Commit: 694f15dee37e46eb4dc3843bdeb5168366cc1f11
Author: Campbell Barton
Date: Sat Nov 15 14:11:51 2014 +0100
Branches: master
https://developer.blender.org/rB694f15dee37e46eb4dc3843bdeb5168366cc1f11
Cleanup: remove unused redraw flag
===================================================================
M source/blender/editors/include/UI_interface.h
M source/blender/editors/interface/interface_regions.c
M source/blender/editors/interface/interface_templates.c
M source/blender/editors/space_view3d/view3d_toolbar.c
===================================================================
diff --git a/source/blender/editors/include/UI_interface.h
b/source/blender/editors/include/UI_interface.h
index ebd0079..26598a6 100644
--- a/source/blender/editors/include/UI_interface.h
+++ b/source/blender/editors/include/UI_interface.h
@@ -124,7 +124,6 @@ enum {
/* uiBlock->flag (controls) */
#define UI_BLOCK_LOOP (1 << 0)
-#define UI_BLOCK_REDRAW (1 << 1)
#define UI_BLOCK_SEARCH_MENU (1 << 2)
#define UI_BLOCK_NUMSELECT (1 << 3)
#define UI_BLOCK_NO_WIN_CLIP (1 << 4) /* don't apply window clipping */
/* was UI_BLOCK_ENTER_OK */
diff --git a/source/blender/editors/interface/interface_regions.c
b/source/blender/editors/interface/interface_regions.c
index 77825ca..7cc4bca 100644
--- a/source/blender/editors/interface/interface_regions.c
+++ b/source/blender/editors/interface/interface_regions.c
@@ -2331,7 +2331,7 @@ uiBlock *ui_block_func_COLOR(bContext *C,
uiPopupBlockHandle *handle, void *arg_
ui_block_colorpicker(block, handle->retvec, &but->rnapoin,
but->rnaprop, show_picker);
- block->flag = UI_BLOCK_LOOP | UI_BLOCK_REDRAW | UI_BLOCK_KEEP_OPEN |
UI_BLOCK_OUT_1 | UI_BLOCK_MOVEMOUSE_QUIT;
+ block->flag = UI_BLOCK_LOOP | UI_BLOCK_KEEP_OPEN | UI_BLOCK_OUT_1 |
UI_BLOCK_MOVEMOUSE_QUIT;
UI_block_bounds_set_normal(block, 0.5 * UI_UNIT_X);
block->block_event_func = ui_colorpicker_small_wheel_cb;
@@ -2504,7 +2504,7 @@ static uiBlock *ui_block_func_POPUP(bContext *C,
uiPopupBlockHandle *handle, voi
if (pup->popup) {
uiBut *but_activate = NULL;
- UI_block_flag_enable(block, UI_BLOCK_LOOP | UI_BLOCK_REDRAW |
UI_BLOCK_NUMSELECT);
+ UI_block_flag_enable(block, UI_BLOCK_LOOP | UI_BLOCK_NUMSELECT);
UI_block_direction_set(block, direction);
/* offset the mouse position, possibly based on earlier
selection */
@@ -2712,7 +2712,7 @@ static uiBlock *ui_block_func_PIE(bContext *UNUSED(C),
uiPopupBlockHandle *handl
UI_block_layout_resolve(block, &width, &height);
- UI_block_flag_enable(block, UI_BLOCK_LOOP | UI_BLOCK_REDRAW |
UI_BLOCK_NUMSELECT);
+ UI_block_flag_enable(block, UI_BLOCK_LOOP | UI_BLOCK_NUMSELECT);
block->minbounds = minwidth;
block->bounds = 1;
diff --git a/source/blender/editors/interface/interface_templates.c
b/source/blender/editors/interface/interface_templates.c
index b3ba4fa..95cb36a 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -184,7 +184,7 @@ static uiBlock *id_search_menu(bContext *C, ARegion *ar,
void *arg_litem)
idptr = RNA_property_pointer_get(&template.ptr, template.prop);
block = UI_block_begin(C, ar, "_popup", UI_EMBOSS);
- UI_block_flag_enable(block, UI_BLOCK_LOOP | UI_BLOCK_REDRAW |
UI_BLOCK_SEARCH_MENU);
+ UI_block_flag_enable(block, UI_BLOCK_LOOP | UI_BLOCK_SEARCH_MENU);
/* preview thumbnails */
if (template.prv_rows > 0 && template.prv_cols > 0) {
@@ -1636,7 +1636,7 @@ static uiBlock *ui_icon_view_menu_cb(bContext *C, ARegion
*ar, void *arg_litem)
// icon = RNA_property_enum_get(&cb.ptr, cb.prop);
block = UI_block_begin(C, ar, "_popup", UI_EMBOSS);
- UI_block_flag_enable(block, UI_BLOCK_LOOP | UI_BLOCK_REDRAW);
+ UI_block_flag_enable(block, UI_BLOCK_LOOP);
RNA_property_enum_items(C, &cb.ptr, cb.prop, &item, NULL, &free);
diff --git a/source/blender/editors/space_view3d/view3d_toolbar.c
b/source/blender/editors/space_view3d/view3d_toolbar.c
index d416ec1..0e17d8f 100644
--- a/source/blender/editors/space_view3d/view3d_toolbar.c
+++ b/source/blender/editors/space_view3d/view3d_toolbar.c
@@ -180,7 +180,7 @@ static uiBlock *tool_search_menu(bContext *C, ARegion *ar,
void *arg_listbase)
search[0] = 0;
block = UI_block_begin(C, ar, "_popup", UI_EMBOSS);
- UI_block_flag_enable(block, UI_BLOCK_LOOP | UI_BLOCK_REDRAW |
UI_BLOCK_SEARCH_MENU);
+ UI_block_flag_enable(block, UI_BLOCK_LOOP | UI_BLOCK_SEARCH_MENU);
/* fake button, it holds space for search items */
uiDefBut(block, UI_BTYPE_LABEL, 0, "", 10, 15, UI_searchbox_size_x(),
UI_searchbox_size_y(), NULL, 0, 0, 0, 0, NULL);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
