diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-04-16 18:23:24 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-04-16 18:24:20 +0300 |
| commit | 9a11aeb300cef2eef5df3b606468a6bcdaca3550 (patch) | |
| tree | 7265ef366b503021c8d18497d04b49a374309829 /source/blender/editors/space_sequencer | |
| parent | 3a14a0381288ae9f49d1ab489a250cd29a00e771 (diff) | |
| parent | 95eb9f22e69622c5817707fa9534521613e7d7cc (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/space_sequencer')
| -rw-r--r-- | source/blender/editors/space_sequencer/sequencer_draw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c index 8e5863fd514..4406c0c5b52 100644 --- a/source/blender/editors/space_sequencer/sequencer_draw.c +++ b/source/blender/editors/space_sequencer/sequencer_draw.c @@ -1454,7 +1454,7 @@ void draw_image_seq(const bContext *C, Scene *scene, ARegion *ar, SpaceSeq *sseq /* NOTE: sequencer mask editing isnt finished, the draw code is working but editing not, * for now just disable drawing since the strip frame will likely be offset */ - //if (sc->mode == SC_MODE_MASKEDIT) { + // if (sc->mode == SC_MODE_MASKEDIT) if (0 && sseq->mainb == SEQ_DRAW_IMG_IMBUF) { Mask *mask = BKE_sequencer_mask_get(scene); |