diff options
Diffstat (limited to 'source/blender/editors/space_sequencer')
5 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c index dd6d58ee5a2..719332046b3 100644 --- a/source/blender/editors/space_sequencer/sequencer_add.c +++ b/source/blender/editors/space_sequencer/sequencer_add.c @@ -564,7 +564,7 @@ static const EnumPropertyItem *strip_new_sequencer_enum_itemf(bContext *C, else { Scene *scene = CTX_data_scene(C); Sequence *seq = SEQ_select_active_get(scene); - if ((seq && (seq->type == SEQ_TYPE_SCENE) && (seq->scene != NULL))) { + if (seq && (seq->type == SEQ_TYPE_SCENE) && (seq->scene != NULL)) { has_scene_or_no_context = true; } } diff --git a/source/blender/editors/space_sequencer/sequencer_channels_draw.c b/source/blender/editors/space_sequencer/sequencer_channels_draw.c index 81fc87598f8..8abd7e424d1 100644 --- a/source/blender/editors/space_sequencer/sequencer_channels_draw.c +++ b/source/blender/editors/space_sequencer/sequencer_channels_draw.c @@ -78,7 +78,7 @@ static float icon_width_get(const SeqChannelDrawContext *context) static float widget_y_offset(const SeqChannelDrawContext *context) { - return (((context->channel_height / context->scale) - icon_width_get(context))) / 2; + return ((context->channel_height / context->scale) - icon_width_get(context)) / 2; } static float channel_index_y_min(const SeqChannelDrawContext *context, const int index) diff --git a/source/blender/editors/space_sequencer/sequencer_scopes.c b/source/blender/editors/space_sequencer/sequencer_scopes.c index af0aa093e40..a1dd9ce2ac2 100644 --- a/source/blender/editors/space_sequencer/sequencer_scopes.c +++ b/source/blender/editors/space_sequencer/sequencer_scopes.c @@ -615,7 +615,7 @@ static void vectorscope_put_cross(uchar r, uchar g, uchar b, char *tgt, int w, i rgb[2] = (float)b / 255.0f; rgb_to_yuv_normalized(rgb, yuv); - p = tgt + 4 * (w * (int)((yuv[2] * (h - 3) + 1)) + (int)((yuv[1] * (w - 3) + 1))); + p = tgt + 4 * (w * (int)(yuv[2] * (h - 3) + 1) + (int)(yuv[1] * (w - 3) + 1)); if (r == 0 && g == 0 && b == 0) { r = 255; @@ -667,7 +667,7 @@ static ImBuf *make_vectorscope_view_from_ibuf_byte(ImBuf *ibuf) rgb[2] = (float)src1[2] / 255.0f; rgb_to_yuv_normalized(rgb, yuv); - p = tgt + 4 * (w * (int)((yuv[2] * (h - 3) + 1)) + (int)((yuv[1] * (w - 3) + 1))); + p = tgt + 4 * (w * (int)(yuv[2] * (h - 3) + 1) + (int)(yuv[1] * (w - 3) + 1)); scope_put_pixel(wtable, (uchar *)p); } } @@ -713,7 +713,7 @@ static ImBuf *make_vectorscope_view_from_ibuf_float(ImBuf *ibuf) rgb_to_yuv_normalized(rgb, yuv); - p = tgt + 4 * (w * (int)((yuv[2] * (h - 3) + 1)) + (int)((yuv[1] * (w - 3) + 1))); + p = tgt + 4 * (w * (int)(yuv[2] * (h - 3) + 1) + (int)(yuv[1] * (w - 3) + 1)); scope_put_pixel(wtable, (uchar *)p); } } diff --git a/source/blender/editors/space_sequencer/sequencer_select.c b/source/blender/editors/space_sequencer/sequencer_select.c index 4aaa3aeb2ff..fde8bc16f6b 100644 --- a/source/blender/editors/space_sequencer/sequencer_select.c +++ b/source/blender/editors/space_sequencer/sequencer_select.c @@ -973,7 +973,7 @@ static int sequencer_select_exec(bContext *C, wmOperator *op) bool changed = false; /* Deselect everything */ - if (deselect_all || (seq && ((extend == false && deselect == false && toggle == false)))) { + if (deselect_all || (seq && (extend == false && deselect == false && toggle == false))) { ED_sequencer_deselect_all(scene); changed = true; } diff --git a/source/blender/editors/space_sequencer/sequencer_thumbnails.c b/source/blender/editors/space_sequencer/sequencer_thumbnails.c index a11b5663620..862ddc803e2 100644 --- a/source/blender/editors/space_sequencer/sequencer_thumbnails.c +++ b/source/blender/editors/space_sequencer/sequencer_thumbnails.c @@ -374,7 +374,7 @@ static int sequencer_thumbnail_closest_guaranteed_frame_get(struct Scene *scene, /* Set of "guaranteed" thumbnails. */ const int frame_index = timeline_frame - SEQ_time_left_handle_frame_get(scene, seq); const int frame_step = SEQ_render_thumbnails_guaranteed_set_frame_step_get(scene, seq); - const int relative_base_frame = round_fl_to_int((frame_index / (float)frame_step)) * frame_step; + const int relative_base_frame = round_fl_to_int(frame_index / (float)frame_step) * frame_step; const int nearest_guaranted_absolute_frame = relative_base_frame + SEQ_time_left_handle_frame_get(scene, seq); return nearest_guaranted_absolute_frame; |