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>2012-09-09 04:00:21 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-09-09 04:00:21 +0400
commitaa2d84da37c909fa6b0ed03b54b0a3bc880f00a6 (patch)
tree0697e5957230bc6ff2ff48e9190e844e6853ea6c /source/blender/editors/space_sequencer
parent693ceacc86786003dbe165fda985dd1f4911bd07 (diff)
style cleanup:
also remove some redundant conversions int -> short -> int
Diffstat (limited to 'source/blender/editors/space_sequencer')
-rw-r--r--source/blender/editors/space_sequencer/sequencer_edit.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c
index 5a40c2ce4e7..06b508cc488 100644
--- a/source/blender/editors/space_sequencer/sequencer_edit.c
+++ b/source/blender/editors/space_sequencer/sequencer_edit.c
@@ -381,8 +381,8 @@ Sequence *find_nearest_seq(Scene *scene, View2D *v2d, int *hand, const int mval[
while (seq) {
if (seq->machine == (int)y) {
/* check for both normal strips, and strips that have been flipped horizontally */
- if ( ((seq->startdisp < seq->enddisp) && (seq->startdisp <= x && seq->enddisp >= x)) ||
- ((seq->startdisp > seq->enddisp) && (seq->startdisp >= x && seq->enddisp <= x)) )
+ if (((seq->startdisp < seq->enddisp) && (seq->startdisp <= x && seq->enddisp >= x)) ||
+ ((seq->startdisp > seq->enddisp) && (seq->startdisp >= x && seq->enddisp <= x)) )
{
if (BKE_sequence_tx_test(seq)) {
@@ -2447,7 +2447,7 @@ static Sequence *sequence_find_parent(Scene *scene, Sequence *child)
if (ed == NULL) return NULL;
for (seq = ed->seqbasep->first; seq; seq = seq->next) {
- if ( (seq != child) && seq_is_parent(seq, child) ) {
+ if ((seq != child) && seq_is_parent(seq, child)) {
parent = seq;
break;
}
@@ -2563,7 +2563,7 @@ static int sequencer_rendersize_exec(bContext *C, wmOperator *UNUSED(op))
if (se) {
// prevent setting the render size if sequence values aren't initialized
- if ( (se->orig_width > 0) && (se->orig_height > 0) ) {
+ if ((se->orig_width > 0) && (se->orig_height > 0)) {
scene->r.xsch = se->orig_width;
scene->r.ysch = se->orig_height;
WM_event_add_notifier(C, NC_SCENE | ND_RENDER_OPTIONS, scene);