sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Cleanup: warnings

Browse Source
This commit is contained in:
Campbell Barton 2017-03-31 09:48:38 +11:00
parent 4cfac9edab
commit 14c2083460
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/editors/interface/interface_handlers.c
View File

@ -637,7 +637,7 @@ PointerRNA *ui_handle_afterfunc_add_operator(wmOperatorType *ot, int opcontext,
return ptr; return ptr;
} }
static void popup_check(bContext *C, const wmOperator *op) static void popup_check(bContext *C, wmOperator *op)
{ {
if (op && op->type->check && op->type->check(C, op)) { if (op && op->type->check && op->type->check(C, op)) {
/* check for popup and re-layout buttons */ /* check for popup and re-layout buttons */
@ -654,7 +654,7 @@ static bool ui_afterfunc_check(const uiBlock *block, const uiBut *but)
{ {
return (but->func || but->funcN || but->rename_func || but->optype || but->rnaprop || block->handle_func || return (but->func || but->funcN || but->rename_func || but->optype || but->rnaprop || block->handle_func ||
(but->type == UI_BTYPE_BUT_MENU && block->butm_func) || (but->type == UI_BTYPE_BUT_MENU && block->butm_func) ||
block->handle && block->handle->popup_op); (block->handle && block->handle->popup_op));
} }
static void ui_apply_but_func(bContext *C, uiBut *but) static void ui_apply_but_func(bContext *C, uiBut *but)