Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2015-10-03 01:22:48 +0300
committerCampbell Barton <ideasman42@gmail.com>2015-10-03 01:22:48 +0300
commit41d05474904bbffcb2bfa338a8dd91e2098360b3 (patch)
tree82552fc92a01c83d848b9048ab0b1ce5e99d5725 /source/blender
parentcaf98e29c5e9508b4edbcd287520a5bf0a0e13ca (diff)
Cleanup: style
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/editors/interface/interface_handlers.c4
-rw-r--r--source/blender/editors/space_file/filelist.c1
2 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index a9df9281aee..85b3f11c44e 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -6708,12 +6708,12 @@ static bool ui_but_menu(bContext *C, uiBut *but)
but2 = uiDefIconTextBut(block, UI_BTYPE_BUT, 0, ICON_NONE,
CTX_IFACE_(BLT_I18NCONTEXT_OPERATOR_DEFAULT, "Change Shortcut"),
- 0, 0, w, UI_UNIT_Y, NULL, 0, 0, 0, 0, "");
+ 0, 0, w, UI_UNIT_Y, NULL, 0, 0, 0, 0, "");
UI_but_func_set(but2, popup_change_shortcut_func, but, NULL);
but2 = uiDefIconTextBut(block, UI_BTYPE_BUT, 0, ICON_NONE,
CTX_IFACE_(BLT_I18NCONTEXT_OPERATOR_DEFAULT, "Remove Shortcut"),
- 0, 0, w, UI_UNIT_Y, NULL, 0, 0, 0, 0, "");
+ 0, 0, w, UI_UNIT_Y, NULL, 0, 0, 0, 0, "");
UI_but_func_set(but2, remove_shortcut_func, but, NULL);
}
else {
diff --git a/source/blender/editors/space_file/filelist.c b/source/blender/editors/space_file/filelist.c
index 1b5987d0901..56c48b7f650 100644
--- a/source/blender/editors/space_file/filelist.c
+++ b/source/blender/editors/space_file/filelist.c
@@ -532,6 +532,7 @@ void filelist_sort(struct FileList *filelist)
case FILE_SORT_NONE: /* Should never reach this point! */
default:
BLI_assert(0);
+ break;
}
filelist_filter_clear(filelist);