diff options
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenkernel/intern/movieclip.c | 1 | ||||
| -rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/mask/mask_ops.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/screen/area.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_clip/clip_ops.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/space_image/image_ops.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/space_node/drawnode.c | 2 |
7 files changed, 9 insertions, 10 deletions
diff --git a/source/blender/blenkernel/intern/movieclip.c b/source/blender/blenkernel/intern/movieclip.c index 8cdf29849e5..f9cd1b2a6c5 100644 --- a/source/blender/blenkernel/intern/movieclip.c +++ b/source/blender/blenkernel/intern/movieclip.c @@ -280,7 +280,6 @@ static ImBuf *movieclip_load_movie_file(MovieClip *clip, MovieClipUser *user, in movieclip_open_anim_file(clip); if (clip->anim) { - int dur = IMB_anim_get_duration(clip->anim, tc); int fra = framenr - clip->start_frame + clip->frame_offset; ibuf = IMB_anim_absolute(clip->anim, fra, tc, proxy); diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index 6f06544c3e2..bd305e27283 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -7284,7 +7284,7 @@ static int ui_handle_list_event(bContext *C, const wmEvent *event, ARegion *ar) if (val == KM_PRESS) { if (ELEM(type, UPARROWKEY, DOWNARROWKEY) || - ((ELEM(type, WHEELUPMOUSE, WHEELDOWNMOUSE) && event->alt))) + ((ELEM(type, WHEELUPMOUSE, WHEELDOWNMOUSE) && event->alt))) { const int value_orig = RNA_property_int_get(&but->rnapoin, but->rnaprop); int value, min, max, inc; @@ -7308,7 +7308,7 @@ static int ui_handle_list_event(bContext *C, const wmEvent *event, ARegion *ar) for (i = 0; i < len; i++) { if (!dyn_data->items_filter_flags || - ((dyn_data->items_filter_flags[i] & UILST_FLT_ITEM) ^ filter_exclude)) + ((dyn_data->items_filter_flags[i] & UILST_FLT_ITEM) ^ filter_exclude)) { org_order[new_order ? new_order[++org_idx] : ++org_idx] = i; if (i == value) { diff --git a/source/blender/editors/mask/mask_ops.c b/source/blender/editors/mask/mask_ops.c index c262f177252..775859ba1ef 100644 --- a/source/blender/editors/mask/mask_ops.c +++ b/source/blender/editors/mask/mask_ops.c @@ -107,7 +107,7 @@ MaskSplinePoint *ED_mask_point_find_nearest(const bContext *C, Mask *mask, const MaskSplinePoint *cur_point_deform = &points_array[i]; eMaskWhichHandle cur_which_handle = MASK_WHICH_HANDLE_NONE; BezTriple *bezt = &cur_point_deform->bezt; - float cur_len_sq , vec[2]; + float cur_len_sq, vec[2]; vec[0] = bezt->vec[1][0] * scalex; vec[1] = bezt->vec[1][1] * scaley; diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c index 907f5fe4117..71c55ddc4d5 100644 --- a/source/blender/editors/screen/area.c +++ b/source/blender/editors/screen/area.c @@ -1349,7 +1349,7 @@ void ED_region_init(bContext *C, ARegion *ar) } /* for quick toggle, can skip fades */ -void region_toggle_hidden(bContext *C, ARegion *ar, bool do_fade) +void region_toggle_hidden(bContext *C, ARegion *ar, const bool do_fade) { ScrArea *sa = CTX_wm_area(C); diff --git a/source/blender/editors/space_clip/clip_ops.c b/source/blender/editors/space_clip/clip_ops.c index b901ff4ece8..3f0a376d791 100644 --- a/source/blender/editors/space_clip/clip_ops.c +++ b/source/blender/editors/space_clip/clip_ops.c @@ -620,7 +620,7 @@ static int view_zoom_in_exec(bContext *C, wmOperator *op) RNA_float_get_array(op->ptr, "location", location); - sclip_zoom_set_factor(C, powf(2.0f, 1.0f/3.0f), location); + sclip_zoom_set_factor(C, powf(2.0f, 1.0f / 3.0f), location); ED_region_tag_redraw(CTX_wm_region(C)); @@ -663,7 +663,7 @@ static int view_zoom_out_exec(bContext *C, wmOperator *op) RNA_float_get_array(op->ptr, "location", location); - sclip_zoom_set_factor(C, powf(0.5f, 1.0f/3.0f), location); + sclip_zoom_set_factor(C, powf(0.5f, 1.0f / 3.0f), location); ED_region_tag_redraw(CTX_wm_region(C)); diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c index d299d690989..c9dda074667 100644 --- a/source/blender/editors/space_image/image_ops.c +++ b/source/blender/editors/space_image/image_ops.c @@ -780,7 +780,7 @@ static int image_view_zoom_in_exec(bContext *C, wmOperator *op) RNA_float_get_array(op->ptr, "location", location); - sima_zoom_set_factor(sima, ar, powf(2.0f, 1.0f/3.0f), location); + sima_zoom_set_factor(sima, ar, powf(2.0f, 1.0f / 3.0f), location); ED_region_tag_redraw(CTX_wm_region(C)); @@ -825,7 +825,7 @@ static int image_view_zoom_out_exec(bContext *C, wmOperator *op) RNA_float_get_array(op->ptr, "location", location); - sima_zoom_set_factor(sima, ar, powf(0.5f, 1.0f/3.0f), location); + sima_zoom_set_factor(sima, ar, powf(0.5f, 1.0f / 3.0f), location); ED_region_tag_redraw(CTX_wm_region(C)); diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c index d64607c5481..ae5737a04d0 100644 --- a/source/blender/editors/space_node/drawnode.c +++ b/source/blender/editors/space_node/drawnode.c @@ -877,7 +877,7 @@ static void node_shader_buts_uvmap(uiLayout *layout, bContext *C, PointerRNA *pt { uiItemR(layout, ptr, "from_dupli", 0, NULL, 0); - if(!RNA_boolean_get(ptr, "from_dupli")) { + if (!RNA_boolean_get(ptr, "from_dupli")) { PointerRNA obptr = CTX_data_pointer_get(C, "active_object"); if (obptr.data && RNA_enum_get(&obptr, "type") == OB_MESH) { |