diff options
-rw-r--r-- | build_files/cmake/cmake_static_check_cppcheck.py | 4 | ||||
-rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/build_files/cmake/cmake_static_check_cppcheck.py b/build_files/cmake/cmake_static_check_cppcheck.py index 25e39376dd2..aac522dfdd3 100644 --- a/build_files/cmake/cmake_static_check_cppcheck.py +++ b/build_files/cmake/cmake_static_check_cppcheck.py @@ -52,6 +52,7 @@ if USE_QUIET: def main(): source_info = project_source_info.build_info(ignore_prefix_list=CHECKER_IGNORE_PREFIX) + source_defines = project_source_info.build_defines_as_args() check_commands = [] for c, inc_dirs, defs in source_info: @@ -59,7 +60,8 @@ def main(): CHECKER_ARGS + [c] + [("-I%s" % i) for i in inc_dirs] + - [("-D%s" % d) for d in defs] + [("-D%s" % d) for d in defs] + + source_defines ) check_commands.append((c, cmd)) diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index 622559cd30f..f9ee2b67e6b 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -228,10 +228,10 @@ typedef struct uiAfterFunc { bContextStore *context; char undostr[BKE_UNDO_STR_MAX]; - - int autokey; } uiAfterFunc; + + static bool ui_but_contains_pt(uiBut *but, int mx, int my); static bool ui_mouse_inside_button(ARegion *ar, uiBut *but, int x, int y); static void button_activate_state(bContext *C, uiBut *but, uiHandleButtonState state); |