Commit: 14c208346021c39b05acb0b11a9e312e2cea00d0
Author: Campbell Barton
Date: Fri Mar 31 09:48:38 2017 +1100
Branches: master
https://developer.blender.org/rB14c208346021c39b05acb0b11a9e312e2cea00d0
Cleanup: warnings
===================================================================
M source/blender/editors/interface/interface_handlers.c
===================================================================
diff --git a/source/blender/editors/interface/interface_handlers.c
b/source/blender/editors/interface/interface_handlers.c
index 259ccb60ba7..2974c2e9304 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -637,7 +637,7 @@ PointerRNA *ui_handle_afterfunc_add_operator(wmOperatorType
*ot, int opcontext,
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)) {
/* 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 ||
(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)
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
