Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

remove unused auto-key struct-member from uiAfterFunc, add compiler defines to cppcheck utility script.

Browse Source
This commit is contained in:
Campbell Barton
2013-08-10 23:27:42 +00:00
parent 76cb6829e5
commit a62163ada3
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build_files/cmake/cmake_static_check_cppcheck.py
View File

@@ -52,6 +52,7 @@ if USE_QUIET:
def main(): def main():
source_info = project_source_info.build_info(ignore_prefix_list=CHECKER_IGNORE_PREFIX) source_info = project_source_info.build_info(ignore_prefix_list=CHECKER_IGNORE_PREFIX)
source_defines = project_source_info.build_defines_as_args()
check_commands = [] check_commands = []
for c, inc_dirs, defs in source_info: for c, inc_dirs, defs in source_info:
@@ -59,7 +60,8 @@ def main():
CHECKER_ARGS + CHECKER_ARGS +
[c] + [c] +
[("-I%s" % i) for i in inc_dirs] + [("-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)) check_commands.append((c, cmd))

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

@@ -228,10 +228,10 @@ typedef struct uiAfterFunc {
bContextStore *context; bContextStore *context;
char undostr[BKE_UNDO_STR_MAX]; char undostr[BKE_UNDO_STR_MAX];
int autokey;
} uiAfterFunc; } uiAfterFunc;
static bool ui_but_contains_pt(uiBut *but, int mx, int my); 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 bool ui_mouse_inside_button(ARegion *ar, uiBut *but, int x, int y);
static void button_activate_state(bContext *C, uiBut *but, uiHandleButtonState state); static void button_activate_state(bContext *C, uiBut *but, uiHandleButtonState state);