diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-09-30 21:54:35 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-09-30 21:54:35 +0400 |
| commit | 00140a8584d5eb2fbd4697906b67f4f5326caab5 (patch) | |
| tree | a97c50131a1a6855b4f22893811fdec20d191b15 /source/blender/editors/space_sequencer/sequencer_view.c | |
| parent | aec701721184c711a54632a0849ba9d8386f52d4 (diff) | |
Fix #36892: crash running "Sample Color" operator from 3D viewport when the
sequencer contained any data. The sequence color sample operator was available
here when it shouldn't be.
Diffstat (limited to 'source/blender/editors/space_sequencer/sequencer_view.c')
| -rw-r--r-- | source/blender/editors/space_sequencer/sequencer_view.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_view.c b/source/blender/editors/space_sequencer/sequencer_view.c index 18733d4e409..deb37f8d943 100644 --- a/source/blender/editors/space_sequencer/sequencer_view.c +++ b/source/blender/editors/space_sequencer/sequencer_view.c @@ -220,7 +220,8 @@ static int sample_cancel(bContext *C, wmOperator *op) static int sample_poll(bContext *C) { - return BKE_sequencer_editing_get(CTX_data_scene(C), FALSE) != NULL; + SpaceSeq *sseq = CTX_wm_space_seq(C); + return sseq && BKE_sequencer_editing_get(CTX_data_scene(C), FALSE) != NULL; } void SEQUENCER_OT_sample(wmOperatorType *ot) |