[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39635] branches/soc-2011-tomato/source/ blender/editors/interface/interface_handlers.c: Camera tracking integration

[Sergey Sharybin]

Revision: 39635
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39635
Author:   nazgul
Date:     2011-08-22 19:43:07 +0000 (Mon, 22 Aug 2011)
Log Message:
-----------
Camera tracking integration
===========================

Fixed bug with sliding from preview widget: markers should became keyfraned.

NOTE: This commit shouldn't be included into source sending to Google.

Modified Paths:
--------------
    branches/soc-2011-tomato/source/blender/editors/interface/interface_handlers.c

Modified: branches/soc-2011-tomato/source/blender/editors/interface/interface_handlers.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/interface/interface_handlers.c	2011-08-22 19:34:10 UTC (rev 39634)
+++ branches/soc-2011-tomato/source/blender/editors/interface/interface_handlers.c	2011-08-22 19:43:07 UTC (rev 39635)
@@ -4094,7 +4094,7 @@
 			if(scopes->marker->framenr!=scopes->framenr)
 				scopes->marker= BKE_tracking_ensure_marker(scopes->track, scopes->framenr);
 
-			scopes->marker->flag&= ~MARKER_DISABLED;
+			scopes->marker->flag&= ~(MARKER_DISABLED|MARKER_TRACKED);
 			scopes->marker->pos[0]+= -dx*scopes->slide_scale[0] / (but->block->maxx-but->block->minx);
 			scopes->marker->pos[1]+= -dy*scopes->slide_scale[1] / (but->block->maxy-but->block->miny);