Revision: 37741
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37741
Author: nazgul
Date: 2011-06-22 17:45:32 +0000 (Wed, 22 Jun 2011)
Log Message:
-----------
Merging r37738 through r37740 from soc-2011-tomato into soc-2011-salad
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37738
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37740
Modified Paths:
--------------
branches/soc-2011-salad/source/blender/editors/space_clip/tracking_ops.c
Property Changed:
----------------
branches/soc-2011-salad/
Property changes on: branches/soc-2011-salad
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-37529
/branches/soc-2011-pepper:36830-37151
/branches/soc-2011-tomato:36831-37737
/trunk/blender:36834-37735
+ /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-37529
/branches/soc-2011-pepper:36830-37151
/branches/soc-2011-tomato:36831-37740
/trunk/blender:36834-37735
Modified:
branches/soc-2011-salad/source/blender/editors/space_clip/tracking_ops.c
===================================================================
--- branches/soc-2011-salad/source/blender/editors/space_clip/tracking_ops.c
2011-06-22 17:43:09 UTC (rev 37740)
+++ branches/soc-2011-salad/source/blender/editors/space_clip/tracking_ops.c
2011-06-22 17:45:32 UTC (rev 37741)
@@ -704,6 +704,8 @@
clip->tracking_context= tmj->context;
+ tmj->lastfra= tmj->sfra;
+
/* XXX: silly to store this, but this data is needed to update scene
and movieclip
frame numbers when tracking is finished. This introduces better
feedback for artists.
Maybe there's another way to solve this problem, but can't
think better way atm.
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
