[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60448] trunk/blender/source/blender/ editors/space_sequencer/sequencer_view.c: Fix #36892: crash running " Sample Color" operator from 3D viewport when the

[Brecht Van Lommel]

Revision: 60448
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60448
Author:   blendix
Date:     2013-09-30 17:54:35 +0000 (Mon, 30 Sep 2013)
Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_sequencer/sequencer_view.c

Modified: trunk/blender/source/blender/editors/space_sequencer/sequencer_view.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/sequencer_view.c	2013-09-30 16:18:56 UTC (rev 60447)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_view.c	2013-09-30 17:54:35 UTC (rev 60448)
@@ -220,7 +220,8 @@
 
 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)