archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: trailing commas

Browse Source 
Needed for clan-format not to wrap onto one line.
This commit is contained in:
Campbell Barton
2019-02-03 14:01:45 +11:00
parent 141c6073ca
commit 744f633986
488 changed files with 1658 additions and 1616 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/windowmanager/WM_types.h
View File

@@ -158,7 +158,7 @@ enum {
WM_OP_EXEC_REGION_CHANNELS,
WM_OP_EXEC_REGION_PREVIEW,
WM_OP_EXEC_AREA,
WM_OP_EXEC_SCREEN
WM_OP_EXEC_SCREEN,
};
/* property tags for RNA_OperatorProperties */

2
source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c
View File

@@ -629,7 +629,7 @@ static wmKeyMap *gizmogroup_tweak_modal_keymap(wmKeyConfig *keyconf, const char
{TWEAK_MODAL_PRECISION_OFF, "PRECISION_OFF", 0, "Disable Precision", ""},
{TWEAK_MODAL_SNAP_ON, "SNAP_ON", 0, "Enable Snap", ""},
{TWEAK_MODAL_SNAP_OFF, "SNAP_OFF", 0, "Disable Snap", ""},
{0, NULL, 0, NULL, NULL}
{0, NULL, 0, NULL, NULL},
};

52
source/blender/windowmanager/intern/wm_cursors.c
View File

@@ -298,7 +298,7 @@ void WM_cursor_time(wmWindow *win, int nr)
{0, 56, 4, 4, 60, 68, 68, 56},
{0, 124, 64, 32, 16, 8, 8, 8},
{0, 60, 66, 66, 60, 66, 66, 60},
{0, 56, 68, 68, 120, 64, 68, 56}
{0, 56, 68, 68, 120, 64, 68, 56},
};
unsigned char mask[16][2];
unsigned char bitmap[16][2] = {{0}};
@@ -397,7 +397,7 @@ BEGIN_CURSOR_BLOCK
32, 32,
15, 15,
/*color*/
BC_BLACK, BC_WHITE
BC_BLACK, BC_WHITE,
};
BlenderCursor[BC_NW_ARROWCURSOR] = &NWArrowCursor;
@@ -409,14 +409,14 @@ BEGIN_CURSOR_BLOCK
0x40, 0x01, 0x20, 0x02, 0x10, 0x04, 0x08, 0x08,
0x04, 0x10, 0x3c, 0x1e, 0x20, 0x02, 0x20, 0x02,
0x20, 0x02, 0x20, 0x02, 0x3c, 0x1e, 0x04, 0x10,
0x08, 0x08, 0x10, 0x04, 0x20, 0x02, 0x40, 0x01
0x08, 0x08, 0x10, 0x04, 0x20, 0x02, 0x40, 0x01,
};
static char ns_smsk[] = {
0xc0, 0x01, 0xe0, 0x03, 0xf0, 0x07, 0xf8, 0x0f,
0xfc, 0x1f, 0xfc, 0x1f, 0xe0, 0x03, 0xe0, 0x03,
0xe0, 0x03, 0xe0, 0x03, 0xfc, 0x1f, 0xfc, 0x1f,
0xf8, 0x0f, 0xf0, 0x07, 0xe0, 0x03, 0xc0, 0x01
0xf8, 0x0f, 0xf0, 0x07, 0xe0, 0x03, 0xc0, 0x01,
};
static BCursor NSArrowCursor = {
@@ -429,7 +429,7 @@ BEGIN_CURSOR_BLOCK
32, 32,
15, 15,
/*color*/
BC_BLACK, BC_WHITE
BC_BLACK, BC_WHITE,
};
BlenderCursor[BC_NS_ARROWCURSOR] = &NSArrowCursor;
@@ -461,7 +461,7 @@ BEGIN_CURSOR_BLOCK
32, 32,
15, 15,
/*color*/
BC_BLACK, BC_WHITE
BC_BLACK, BC_WHITE,
};
BlenderCursor[BC_EW_ARROWCURSOR] = &EWArrowCursor;
@@ -531,7 +531,7 @@ BEGIN_CURSOR_BLOCK
32, 32,
15, 15,
/*color*/
BC_BLACK, BC_WHITE
BC_BLACK, BC_WHITE,
};
BlenderCursor[BC_WAITCURSOR] = &WaitCursor;
@@ -600,7 +600,7 @@ BEGIN_CURSOR_BLOCK
32, 32,
15, 15,
/*color*/
BC_BLACK, BC_WHITE
BC_BLACK, BC_WHITE,
};
BlenderCursor[BC_CROSSCURSOR] = &CrossCursor;
@@ -632,7 +632,7 @@ BEGIN_CURSOR_BLOCK
32, 32,
15, 15,
/*color*/
BC_BLACK, BC_WHITE
BC_BLACK, BC_WHITE,
};
BlenderCursor[BC_EDITCROSSCURSOR] = &EditCrossCursor;
@@ -652,7 +652,6 @@ BEGIN_CURSOR_BLOCK
0x63, 0x06, 0x7f, 0x06, 0x7f, 0x06, 0x00, 0x0f,
0xf0, 0xf9, 0xf0, 0xf9, 0x00, 0x0f, 0x00, 0x06,
0x00, 0x06, 0x00, 0x06, 0x00, 0x06, 0x00, 0x06,
};
static BCursor BoxSelCursor = {
@@ -665,7 +664,7 @@ BEGIN_CURSOR_BLOCK
32, 32,
15, 15,
/*color*/
BC_BLACK, BC_WHITE
BC_BLACK, BC_WHITE,
};
BlenderCursor[BC_BOXSELCURSOR] = &BoxSelCursor;
@@ -677,14 +676,14 @@ BEGIN_CURSOR_BLOCK
0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x2c,
0x00, 0x5a, 0x00, 0x34, 0x00, 0x2a, 0x00, 0x17,
0x80, 0x06, 0x40, 0x03, 0xa0, 0x03, 0xd0, 0x01,
0x68, 0x00, 0x1c, 0x00, 0x06, 0x00, 0x00, 0x00
0x68, 0x00, 0x1c, 0x00, 0x06, 0x00, 0x00, 0x00,
};
static char knife_smsk[] = {
0x00, 0x60, 0x00, 0xf0, 0x00, 0xfc, 0x00, 0xfe,
0x00, 0xfe, 0x00, 0x7e, 0x00, 0x7f, 0x80, 0x3f,
0xc0, 0x0e, 0x60, 0x07, 0xb0, 0x07, 0xd8, 0x03,
0xec, 0x01, 0x7e, 0x00, 0x1f, 0x00, 0x07, 0x00
0xec, 0x01, 0x7e, 0x00, 0x1f, 0x00, 0x07, 0x00,
};
static char knife_lbm[] = {
@@ -704,7 +703,6 @@ BEGIN_CURSOR_BLOCK
0xc0, 0x03, 0x00, 0x00, 0xe0, 0x00, 0x00, 0x00,
0x30, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
static char knife_lmsk[] = {
@@ -724,7 +722,6 @@ BEGIN_CURSOR_BLOCK
0xe0, 0x1b, 0x00, 0x00, 0xf0, 0x06, 0x00, 0x00,
0xb8, 0x01, 0x00, 0x00, 0x6c, 0x00, 0x00, 0x00,
0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
static BCursor KnifeCursor = {
@@ -737,7 +734,7 @@ BEGIN_CURSOR_BLOCK
32, 32,
0, 31,
/*color*/
BC_BLACK, BC_WHITE
BC_BLACK, BC_WHITE,
};
BlenderCursor[BC_KNIFECURSOR] = &KnifeCursor;
@@ -813,7 +810,7 @@ BEGIN_CURSOR_BLOCK
32, 32,
0, 0,
/*color*/
BC_BLACK, BC_WHITE
BC_BLACK, BC_WHITE,
};
BlenderCursor[BC_VLOOPCURSOR] = &VLoopCursor;
@@ -847,7 +844,7 @@ BEGIN_CURSOR_BLOCK
32, 32,
15, 15,
/*color*/
BC_BLACK, BC_WHITE
BC_BLACK, BC_WHITE,
};
BlenderCursor[BC_TEXTEDITCURSOR] = &TextEditCursor;
@@ -862,9 +859,6 @@ BEGIN_CURSOR_BLOCK
0x00, 0x21, 0x80, 0x20, 0x40, 0x13, 0x40, 0x17,
0xa0, 0x0b, 0x98, 0x05, 0x04, 0x02, 0x02, 0x01,
0x02, 0x01, 0x02, 0x01, 0x81, 0x00, 0x7f, 0x00,
};
static char paintbrush_smsk[] = {
@@ -872,8 +866,6 @@ BEGIN_CURSOR_BLOCK
0x00, 0x3f, 0x80, 0x3f, 0xc0, 0x1f, 0xc0, 0x1f,
0xe0, 0x0f, 0xf8, 0x07, 0xfc, 0x03, 0xfe, 0x01,
0xfe, 0x01, 0xfe, 0x01, 0xff, 0x00, 0x7f, 0x00,
};
static BCursor PaintBrushCursor = {
@@ -886,7 +878,7 @@ BEGIN_CURSOR_BLOCK
32, 32,
15, 15,
/*color*/
BC_BLACK, BC_WHITE
BC_BLACK, BC_WHITE,
};
BlenderCursor[BC_PAINTBRUSHCURSOR] = &PaintBrushCursor;
@@ -921,7 +913,7 @@ BEGIN_CURSOR_BLOCK
32, 32,
15, 15,
/*color*/
BC_BLACK, BC_WHITE
BC_BLACK, BC_WHITE,
};
BlenderCursor[BC_HANDCURSOR] = &HandCursor;
@@ -956,7 +948,7 @@ BEGIN_CURSOR_BLOCK
32, 32,
15, 15,
/*color*/
BC_BLACK, BC_WHITE
BC_BLACK, BC_WHITE,
};
BlenderCursor[BC_NSEW_SCROLLCURSOR] = &NSEWScrollCursor;
@@ -992,7 +984,7 @@ BEGIN_CURSOR_BLOCK
32, 32,
15, 15,
/*color*/
BC_BLACK, BC_WHITE
BC_BLACK, BC_WHITE,
};
BlenderCursor[BC_NS_SCROLLCURSOR] = &NSScrollCursor;
@@ -1028,7 +1020,7 @@ BEGIN_CURSOR_BLOCK
32, 32,
15, 15,
/*color*/
BC_BLACK, BC_WHITE
BC_BLACK, BC_WHITE,
};
BlenderCursor[BC_EW_SCROLLCURSOR] = &EWScrollCursor;
@@ -1063,7 +1055,7 @@ BEGIN_CURSOR_BLOCK
32, 32,
15, 15,
/*color*/
BC_BLACK, BC_WHITE
BC_BLACK, BC_WHITE,
};
BlenderCursor[BC_EYEDROPPER_CURSOR] = &EyedropperCursor;
@@ -1096,7 +1088,7 @@ BEGIN_CURSOR_BLOCK
32, 32,
15, 15,
/*color*/
BC_YELLOW, BC_BLUE
BC_YELLOW, BC_BLUE,
};
BlenderCursor[BC_SWAPAREA_CURSOR] = &SwapCursor;

3
source/blender/windowmanager/intern/wm_keymap.c
View File

@@ -1585,7 +1585,8 @@ void WM_keyconfig_update(wmWindowManager *wm)
&wm->userconf->keymaps,
&wm->defaultconf->keymaps,
&wm->addonconf->keymaps,
NULL};
NULL,
};
int i;

10
source/blender/windowmanager/intern/wm_operator_props.c
View File

@@ -61,7 +61,7 @@ void WM_operator_properties_filesel(
{FILE_SHORTDISPLAY, "LIST_SHORT", ICON_SHORTDISPLAY, "Short List", "Display files as short list"},
{FILE_LONGDISPLAY, "LIST_LONG", ICON_LONGDISPLAY, "Long List", "Display files as a detailed list"},
{FILE_IMGDISPLAY, "THUMBNAIL", ICON_IMGDISPLAY, "Thumbnails", "Display files as thumbnails"},
{0, NULL, 0, NULL, NULL}
{0, NULL, 0, NULL, NULL},
};
if (flag & WM_FILESEL_FILEPATH)
@@ -149,7 +149,7 @@ void WM_operator_properties_select_action(wmOperatorType *ot, int default_action
{SEL_SELECT, "SELECT", 0, "Select", "Select all elements"},
{SEL_DESELECT, "DESELECT", 0, "Deselect", "Deselect all elements"},
{SEL_INVERT, "INVERT", 0, "Invert", "Invert selection of all elements"},
{0, NULL, 0, NULL, NULL}
{0, NULL, 0, NULL, NULL},
};
wm_operator_properties_select_action_ex(ot, default_action, select_actions);
@@ -163,7 +163,7 @@ void WM_operator_properties_select_action_simple(wmOperatorType *ot, int default
static const EnumPropertyItem select_actions[] = {
{SEL_SELECT, "SELECT", 0, "Select", "Select all elements"},
{SEL_DESELECT, "DESELECT", 0, "Deselect", "Deselect all elements"},
{0, NULL, 0, NULL, NULL}
{0, NULL, 0, NULL, NULL},
};
wm_operator_properties_select_action_ex(ot, default_action, select_actions);
@@ -272,7 +272,7 @@ void WM_operator_properties_select_operation(wmOperatorType *ot)
{SEL_OP_SUB, "SUB", 0, "Subtract", ""},
{SEL_OP_XOR, "XOR", 0, "Difference", ""},
{SEL_OP_AND, "AND", 0, "Intersect", ""},
{0, NULL, 0, NULL, NULL}
{0, NULL, 0, NULL, NULL},
};
PropertyRNA *prop = RNA_def_enum(ot->srna, "mode", select_mode_items, SEL_OP_SET, "Mode", "");
RNA_def_property_flag(prop, PROP_SKIP_SAVE);
@@ -285,7 +285,7 @@ void WM_operator_properties_select_operation_simple(wmOperatorType *ot)
{SEL_OP_SET, "SET", 0, "New", ""},
{SEL_OP_ADD, "ADD", 0, "Add", ""},
{SEL_OP_SUB, "SUB", 0, "Subtract", ""},
{0, NULL, 0, NULL, NULL}
{0, NULL, 0, NULL, NULL},
};
PropertyRNA *prop = RNA_def_enum(ot->srna, "mode", select_mode_items, SEL_OP_SET, "Mode", "");
RNA_def_property_flag(prop, PROP_SKIP_SAVE);

8
source/blender/windowmanager/intern/wm_operators.c
View File

@@ -3217,7 +3217,7 @@ static void gesture_circle_modal_keymap(wmKeyConfig *keyconf)
{GESTURE_MODAL_DESELECT, "DESELECT", 0, "DeSelect", ""},
{GESTURE_MODAL_NOP, "NOP", 0, "No Operation", ""},
{0, NULL, 0, NULL, NULL}
{0, NULL, 0, NULL, NULL},
};
/* WARNING - name is incorrect, use for non-3d views */
@@ -3246,7 +3246,7 @@ static void gesture_straightline_modal_keymap(wmKeyConfig *keyconf)
{GESTURE_MODAL_CANCEL, "CANCEL", 0, "Cancel", ""},
{GESTURE_MODAL_SELECT, "SELECT", 0, "Select", ""},
{GESTURE_MODAL_BEGIN, "BEGIN", 0, "Begin", ""},
{0, NULL, 0, NULL, NULL}
{0, NULL, 0, NULL, NULL},
};
wmKeyMap *keymap = WM_modalkeymap_get(keyconf, "Gesture Straight Line");
@@ -3271,7 +3271,7 @@ static void gesture_box_modal_keymap(wmKeyConfig *keyconf)
{GESTURE_MODAL_SELECT, "SELECT", 0, "Select", ""},
{GESTURE_MODAL_DESELECT, "DESELECT", 0, "DeSelect", ""},
{GESTURE_MODAL_BEGIN, "BEGIN", 0, "Begin", ""},
{0, NULL, 0, NULL, NULL}
{0, NULL, 0, NULL, NULL},
};
wmKeyMap *keymap = WM_modalkeymap_get(keyconf, "Gesture Box");
@@ -3319,7 +3319,7 @@ static void gesture_zoom_border_modal_keymap(wmKeyConfig *keyconf)
{GESTURE_MODAL_IN, "IN", 0, "In", ""},
{GESTURE_MODAL_OUT, "OUT", 0, "Out", ""},
{GESTURE_MODAL_BEGIN, "BEGIN", 0, "Begin", ""},
{0, NULL, 0, NULL, NULL}
{0, NULL, 0, NULL, NULL},
};
wmKeyMap *keymap = WM_modalkeymap_get(keyconf, "Gesture Zoom Border");

4
source/blender/windowmanager/wm_cursors.h
View File

@@ -39,7 +39,7 @@ enum {
CURSOR_STD,
CURSOR_NONE,
CURSOR_PENCIL,
CURSOR_COPY
CURSOR_COPY,
};
@@ -97,7 +97,7 @@ enum {
BC_RED,
BC_BLUE,
BC_GREEN,
BC_YELLOW
BC_YELLOW,
};
struct wmEvent;

2
source/blender/windowmanager/wm_event_system.h
View File

@@ -77,7 +77,7 @@ typedef struct wmEventHandler {
/* custom types for handlers, for signaling, freeing */
enum {
WM_HANDLER_DEFAULT,
WM_HANDLER_FILESELECT
WM_HANDLER_FILESELECT,
};
/* wm_event_system.c */