diff options
Diffstat (limited to 'source/blender/editors/space_outliner/outliner_tools.c')
-rw-r--r-- | source/blender/editors/space_outliner/outliner_tools.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/editors/space_outliner/outliner_tools.c b/source/blender/editors/space_outliner/outliner_tools.c index 2cf106ea07d..63ffe3da27b 100644 --- a/source/blender/editors/space_outliner/outliner_tools.c +++ b/source/blender/editors/space_outliner/outliner_tools.c @@ -551,7 +551,7 @@ static void merged_element_search_call_cb(struct bContext *C, void *UNUSED(arg1) * Merged element search menu * Created on activation of a merged or aggregated icon-row icon. */ -static uiBlock *merged_element_search_menu(bContext *C, ARegion *ar, void *data) +static uiBlock *merged_element_search_menu(bContext *C, ARegion *region, void *data) { static char search[64] = ""; uiBlock *block; @@ -560,7 +560,7 @@ static uiBlock *merged_element_search_menu(bContext *C, ARegion *ar, void *data) /* Clear search on each menu creation */ *search = '\0'; - block = UI_block_begin(C, ar, __func__, UI_EMBOSS); + block = UI_block_begin(C, region, __func__, UI_EMBOSS); UI_block_flag_enable(block, UI_BLOCK_LOOP | UI_BLOCK_MOVEMOUSE_QUIT | UI_BLOCK_SEARCH_MENU); UI_block_theme_style_set(block, UI_BLOCK_THEME_STYLE_POPUP); @@ -2324,7 +2324,7 @@ static int outliner_operator_menu(bContext *C, const char *opname) } static int do_outliner_operation_event( - bContext *C, ARegion *ar, SpaceOutliner *soops, TreeElement *te, const float mval[2]) + bContext *C, ARegion *region, SpaceOutliner *soops, TreeElement *te, const float mval[2]) { ReportList *reports = CTX_wm_reports(C); // XXX... @@ -2343,7 +2343,7 @@ static int do_outliner_operation_event( /* Only redraw, don't rebuild here because TreeElement pointers will * become invalid and operations will crash. */ - ED_region_tag_redraw_no_rebuild(ar); + ED_region_tag_redraw_no_rebuild(region); } set_operation_types(soops, &soops->tree, &scenelevel, &objectlevel, &idlevel, &datalevel); @@ -2421,7 +2421,7 @@ static int do_outliner_operation_event( } for (te = te->subtree.first; te; te = te->next) { - int retval = do_outliner_operation_event(C, ar, soops, te, mval); + int retval = do_outliner_operation_event(C, region, soops, te, mval); if (retval) { return retval; } @@ -2432,7 +2432,7 @@ static int do_outliner_operation_event( static int outliner_operation(bContext *C, wmOperator *UNUSED(op), const wmEvent *event) { - ARegion *ar = CTX_wm_region(C); + ARegion *region = CTX_wm_region(C); SpaceOutliner *soops = CTX_wm_space_outliner(C); uiBut *but = UI_context_active_but_get(C); TreeElement *te; @@ -2442,10 +2442,10 @@ static int outliner_operation(bContext *C, wmOperator *UNUSED(op), const wmEvent UI_but_tooltip_timer_remove(C, but); } - UI_view2d_region_to_view(&ar->v2d, event->mval[0], event->mval[1], &fmval[0], &fmval[1]); + UI_view2d_region_to_view(®ion->v2d, event->mval[0], event->mval[1], &fmval[0], &fmval[1]); for (te = soops->tree.first; te; te = te->next) { - int retval = do_outliner_operation_event(C, ar, soops, te, fmval); + int retval = do_outliner_operation_event(C, region, soops, te, fmval); if (retval) { return retval; } |