diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-01-25 17:53:41 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-01-25 17:53:41 +0300 |
| commit | 31fc0ff995497b6727457f514f499accfb94a491 (patch) | |
| tree | c7fa033bd0f2c01420f654b5f2014e6a29dca681 /source/blender/editors/gpencil | |
| parent | 2ae25bdba95c5547dadea900ac71f433b2ea81a9 (diff) | |
* added operators SEQUENCER_OT_lock, unlock, reload, refresh_all, view_all, view_selected.
* sequencer transform now does overlap checks.
* removed old transform functions from sequencer_edit.c
* shuffle_seq moved to kernel, now moves strips to the end of the last sequence of itschannel (if all channels are used). 2.4x would remove the strip.
* most of the 'Strip' menu items now call their operators in the header menu, some for view and select too.
Diffstat (limited to 'source/blender/editors/gpencil')
| -rw-r--r-- | source/blender/editors/gpencil/gpencil.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/gpencil/gpencil.c b/source/blender/editors/gpencil/gpencil.c index 6bbe43810ec..dfe76ac6a07 100644 --- a/source/blender/editors/gpencil/gpencil.c +++ b/source/blender/editors/gpencil/gpencil.c @@ -367,7 +367,7 @@ bGPdata *gpencil_data_getactive (ScrArea *sa) SpaceSeq *sseq= sa->spacedata.first; /* only applicable for image modes */ - if (sseq->mainb) + if (sseq->mainb != SEQ_DRAW_SEQUENCE) return sseq->gpd; } break; @@ -431,7 +431,7 @@ short gpencil_data_setactive (ScrArea *sa, bGPdata *gpd) SpaceSeq *sseq= sa->spacedata.first; /* only applicable if right mode */ - if (sseq->mainb) { + if (sseq->mainb != SEQ_DRAW_SEQUENCE) { /* free the existing block */ if (sseq->gpd) free_gpencil_data(sseq->gpd); @@ -1748,7 +1748,7 @@ static void gp_session_initpaint (bContext *C, tGPsdata *p) p->v2d= &ar->v2d; /* check that gpencil data is allowed to be drawn */ - if (sseq->mainb == 0) { + if (sseq->mainb == SEQ_DRAW_SEQUENCE) { p->status= GP_STATUS_ERROR; if (G.f & G_DEBUG) printf("Error: In active view (sequencer), active mode doesn't support Grease Pencil \n"); |