[Bf-blender-cvs] [33f388d] master: Cleanup: style
Campbell Barton
noreply at git.blender.org
Tue Oct 21 20:14:30 CEST 2014
Commit: 33f388d7bf973fb95c0e48625267e2e85036d462
Author: Campbell Barton
Date: Tue Oct 21 19:02:05 2014 +0200
Branches: master
https://developer.blender.org/rB33f388d7bf973fb95c0e48625267e2e85036d462
Cleanup: style
===================================================================
M source/blender/editors/space_sequencer/sequencer_edit.c
M source/blender/editors/space_view3d/view3d_edit.c
M source/blender/editors/space_view3d/view3d_select.c
===================================================================
diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c
index c1f4499..46455e1 100644
--- a/source/blender/editors/space_sequencer/sequencer_edit.c
+++ b/source/blender/editors/space_sequencer/sequencer_edit.c
@@ -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;
diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c
index 213b062..d3bd59c 100644
--- a/source/blender/editors/space_view3d/view3d_edit.c
+++ b/source/blender/editors/space_view3d/view3d_edit.c
@@ -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}
diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c
index 1c044af..9d5240f 100644
--- a/source/blender/editors/space_view3d/view3d_select.c
+++ b/source/blender/editors/space_view3d/view3d_select.c
@@ -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;
}
More information about the Bf-blender-cvs
mailing list