Merge branch 'master' into blender2.8
[blender.git] / source / blender / editors / space_sequencer / sequencer_view.c
index d3d847b..88dcc3a 100644 (file)
@@ -98,7 +98,7 @@ static void sample_apply(bContext *C, wmOperator *op, const wmEvent *event)
        ImBuf *ibuf = sequencer_ibuf_get(bmain, depsgraph, scene, sseq, CFRA, 0, NULL);
        ImageSampleInfo *info = op->customdata;
        float fx, fy;
-       
+
        if (ibuf == NULL) {
                IMB_freeImBuf(ibuf);
                info->draw = 0;
@@ -122,7 +122,7 @@ static void sample_apply(bContext *C, wmOperator *op, const wmEvent *event)
 
                info->colp = NULL;
                info->colfp = NULL;
-               
+
                if (ibuf->rect) {
                        cp = (unsigned char *)(ibuf->rect + y * ibuf->x + x);