[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38573] branches/soc-2011-salad: Merging r38571 through r38572 from soc-2011-tomato into soc-2011-salad

[Sergey Sharybin]

Revision: 38573
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38573
Author:   nazgul
Date:     2011-07-21 17:04:04 +0000 (Thu, 21 Jul 2011)
Log Message:
-----------
Merging r38571 through r38572 from soc-2011-tomato into soc-2011-salad

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38571
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38572

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-38570
/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-38572
/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 17:02:04 UTC (rev 38572)
+++ branches/soc-2011-salad/source/blender/blenkernel/intern/tracking.c	2011-07-21 17:04:04 UTC (rev 38573)
@@ -465,7 +465,7 @@
 						float pattern_size_x= (track->pat_max[0]-track->pat_min[0])*width;
 						float pattern_size_y= (track->pat_max[1]-track->pat_min[1])*height;
 
-						int level= log2f(2.0f * MIN2(search_size_x, search_size_y) / MAX2(pattern_size_x, pattern_size_y));
+						int level= log(2.0f * MIN2(search_size_x, search_size_y) / MAX2(pattern_size_x, pattern_size_y))/M_LN2;
 
 						track_context->region_tracker= libmv_regionTrackerNew(100, level, 0.2);
 					}