diff options
Diffstat (limited to 'source/blender/editors/space_sequencer/sequencer_edit.c')
-rw-r--r-- | source/blender/editors/space_sequencer/sequencer_edit.c | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c index c5f01f88706..50efa881b39 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.c +++ b/source/blender/editors/space_sequencer/sequencer_edit.c @@ -32,24 +32,15 @@ #include <math.h> #include <string.h> -#ifndef WIN32 -#include <unistd.h> -#else -#include <io.h> -#endif -#include <sys/types.h> - #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" #include "BLI_math.h" #include "BLI_utildefines.h" -#include "BLI_threads.h" #include "BLF_translation.h" #include "DNA_scene_types.h" -#include "DNA_userdef_types.h" #include "BKE_context.h" #include "BKE_global.h" @@ -57,7 +48,6 @@ #include "BKE_sequencer.h" #include "BKE_report.h" #include "BKE_sound.h" -#include "BKE_movieclip.h" #include "IMB_imbuf.h" @@ -219,7 +209,7 @@ static void seq_proxy_build_job(const bContext *C) WM_jobs_start(CTX_wm_manager(C), wm_job); } - ED_area_tag_redraw(CTX_wm_area(C)); + ED_area_tag_redraw(sa); } /* ********************************************************************** */ @@ -2296,7 +2286,7 @@ static int sequencer_view_zoom_ratio_exec(bContext *C, wmOperator *op) float facx = BLI_rcti_size_x(&v2d->mask) / winx; float facy = BLI_rcti_size_y(&v2d->mask) / winy; - BLI_rctf_resize(&v2d->cur, floorf(winx * facx * ratio + 0.5f), floorf(winy * facy * ratio + 0.5f)); + BLI_rctf_resize(&v2d->cur, floorf(winx * facx / ratio + 0.5f), floorf(winy * facy / ratio + 0.5f)); ED_region_tag_redraw(CTX_wm_region(C)); @@ -2955,17 +2945,13 @@ void SEQUENCER_OT_swap_data(wmOperatorType *ot) static int view_ghost_border_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); - Editing *ed = BKE_sequencer_editing_get(scene, false); View2D *v2d = UI_view2d_fromcontext(C); rctf rect; /* convert coordinates of rect to 'tot' rect coordinates */ - UI_view2d_region_to_view(v2d, RNA_int_get(op->ptr, "xmin"), RNA_int_get(op->ptr, "ymin"), &rect.xmin, &rect.ymin); - UI_view2d_region_to_view(v2d, RNA_int_get(op->ptr, "xmax"), RNA_int_get(op->ptr, "ymax"), &rect.xmax, &rect.ymax); - - if (ed == NULL) - return OPERATOR_CANCELLED; + WM_operator_properties_border_to_rctf(op, &rect); + UI_view2d_region_to_view_rctf(v2d, &rect, &rect); rect.xmin /= fabsf(BLI_rctf_size_x(&v2d->tot)); rect.ymin /= fabsf(BLI_rctf_size_y(&v2d->tot)); @@ -3168,7 +3154,7 @@ static int sequencer_change_path_exec(bContext *C, wmOperator *op) Scene *scene = CTX_data_scene(C); Editing *ed = BKE_sequencer_editing_get(scene, false); Sequence *seq = BKE_sequencer_active_get(scene); - const int is_relative_path = RNA_boolean_get(op->ptr, "relative_path"); + const bool is_relative_path = RNA_boolean_get(op->ptr, "relative_path"); if (seq->type == SEQ_TYPE_IMAGE) { char directory[FILE_MAX]; |