Revision: 38571
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38571
Author: nazgul
Date: 2011-07-21 16:58:14 +0000 (Thu, 21 Jul 2011)
Log Message:
-----------
Merging r38566 through r38570 from soc-2011-tomato into soc-2011-salad
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38566
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38570
Modified Paths:
--------------
branches/soc-2011-salad/source/blender/blenkernel/intern/tracking.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-carrot:36854,37548,37564,37602,37622,37848,38043,38064,38226,38231,38282
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-38309
/branches/soc-2011-pepper:36830-38208
/branches/soc-2011-tomato:36831-38565
/trunk/blender:36834-38562
+ /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/branches/soc-2011-carrot:36854,37548,37564,37602,37622,37848,38043,38064,38226,38231,38282
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-38309
/branches/soc-2011-pepper:36830-38208
/branches/soc-2011-tomato:36831-38570
/trunk/blender:36834-38562
Modified: branches/soc-2011-salad/source/blender/blenkernel/intern/tracking.c
===================================================================
--- branches/soc-2011-salad/source/blender/blenkernel/intern/tracking.c
2011-07-21 16:56:44 UTC (rev 38570)
+++ branches/soc-2011-salad/source/blender/blenkernel/intern/tracking.c
2011-07-21 16:58:14 UTC (rev 38571)
@@ -32,6 +32,7 @@
#include <stddef.h>
#include <limits.h>
+#include <math.h>
#include "MEM_guardedalloc.h"
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
