blender
/
blender
128
396
Fork 568
Code Issues 6.2k Pull Requests 754 Projects 19 Wiki Activity

Cleanup: style

This commit is contained in:
Campbell Barton 2014-10-21 19:02:05 +02:00
parent c8a62319cf
commit 33f388d7bf
Notes: blender-bot 2023-02-14 09:55:18 +01:00 
Referenced by issue #42345, Two windows stuck together
Referenced by issue #42338, issue with shortcuts
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
source/blender/editors/space_sequencer/sequencer_edit.c
View File

@ -1233,14 +1233,14 @@ void SEQUENCER_OT_snap(struct wmOperatorType *ot)
typedef struct TrimData {
int init_mouse[2];
float init_mouseloc[2];
TransSeq *ts;
Sequence **seq_array;
bool *trim;
int num_seq;
bool slow;
int slow_offset; /* offset at the point where offset was turned on */
int init_mouse[2];
float init_mouseloc[2];
TransSeq *ts;
Sequence **seq_array;
bool *trim;
int num_seq;
bool slow;
int slow_offset; /* offset at the point where offset was turned on */
} TrimData;
static void transseq_backup(TransSeq *ts, Sequence *seq)
@ -1274,7 +1274,8 @@ static void transseq_restore(TransSeq *ts, Sequence *seq)
seq->len = ts->len;
}
static int trim_add_sequences_rec(ListBase *seqbasep, Sequence **seq_array, bool *trim, int offset, bool first_level) {
static int trim_add_sequences_rec(ListBase *seqbasep, Sequence **seq_array, bool *trim, int offset, bool first_level)
{
Sequence *seq;
int num_items = 0;
@ -1297,7 +1298,8 @@ static int trim_add_sequences_rec(ListBase *seqbasep, Sequence **seq_array, bool
return num_items;
}
static int trim_count_sequences_rec(ListBase *seqbasep, bool first_level) {
static int trim_count_sequences_rec(ListBase *seqbasep, bool first_level)
{
Sequence *seq;
int trimmed_sequences = 0;

2
source/blender/editors/space_view3d/view3d_edit.c
View File

@ -4009,7 +4009,7 @@ static int viewroll_modal(bContext *C, wmOperator *op, const wmEvent *event)
}
static EnumPropertyItem prop_view_roll_items[] = {
{0, "ROLLANGLE", 0, "Roll Angle", "Roll the view using an angle value"},
{0, "ROLLANGLE", 0, "Roll Angle", "Roll the view using an angle value"},
{V3D_VIEW_STEPLEFT, "ROLLLEFT", 0, "Roll Left", "Roll the view around to the Left"},
{V3D_VIEW_STEPRIGHT, "ROLLTRIGHT", 0, "Roll Right", "Roll the view around to the Right"},
{0, NULL, 0, NULL, NULL}

4
source/blender/editors/space_view3d/view3d_select.c
View File

@ -1181,14 +1181,14 @@ static short selectbuffer_ret_hits_15(unsigned int *UNUSED(buffer), const short
static short selectbuffer_ret_hits_9(unsigned int *buffer, const short hits15, const short hits9)
{
const int offs = 4 * hits15;
memcpy(buffer, buffer + offs, 4 * hits9 * sizeof (unsigned int));
memcpy(buffer, buffer + offs, 4 * hits9 * sizeof(unsigned int));
return hits9;
}
static short selectbuffer_ret_hits_5(unsigned int *buffer, const short hits15, const short hits9, const short hits5)
{
const int offs = 4 * hits15 + 4 * hits9;
memcpy(buffer, buffer + offs, 4 * hits5 * sizeof (unsigned int));
memcpy(buffer, buffer + offs, 4 * hits5 * sizeof(unsigned int));
return hits5;
}