[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50422] trunk/blender/source/blender/ editors/space_sequencer/sequencer_view.c: Sequencer: show color sample line in image display mode only

Sergey Sharybin sergey.vfx at gmail.com
Wed Sep 5 16:11:22 CEST 2012


Revision: 50422
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50422
Author:   nazgul
Date:     2012-09-05 14:11:22 +0000 (Wed, 05 Sep 2012)
Log Message:
-----------
Sequencer: show color sample line in image display mode only

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	2012-09-05 13:58:01 UTC (rev 50421)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_view.c	2012-09-05 14:11:22 UTC (rev 50422)
@@ -162,8 +162,12 @@
 static int sample_invoke(bContext *C, wmOperator *op, wmEvent *event)
 {
 	ARegion *ar = CTX_wm_region(C);
+	SpaceSeq *sseq = CTX_wm_space_seq(C);
 	ImageSampleInfo *info;
 
+	if (sseq->mainb != SEQ_DRAW_IMG_IMBUF)
+		return OPERATOR_CANCELLED;
+
 	info = MEM_callocN(sizeof(ImageSampleInfo), "ImageSampleInfo");
 	info->art = ar->type;
 	info->draw_handle = ED_region_draw_cb_activate(ar->type, sample_draw, info, REGION_DRAW_POST_PIXEL);




More information about the Bf-blender-cvs mailing list