[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38558] branches/soc-2011-tomato/source/ blender/editors/space_clip: Camera tracking integration

[Sergey Sharybin]

Revision: 38558
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38558
Author:   nazgul
Date:     2011-07-21 09:47:33 +0000 (Thu, 21 Jul 2011)
Log Message:
-----------
Camera tracking integration
===========================

- Small fix for recent commit -- zoom was calculating incorrect
  for some values of aspect ratio.
- Small spelling fixes for operator descriptions.

Modified Paths:
--------------
    branches/soc-2011-tomato/source/blender/editors/space_clip/clip_editor.c
    branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c

Modified: branches/soc-2011-tomato/source/blender/editors/space_clip/clip_editor.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/space_clip/clip_editor.c	2011-07-21 09:40:59 UTC (rev 38557)
+++ branches/soc-2011-tomato/source/blender/editors/space_clip/clip_editor.c	2011-07-21 09:47:33 UTC (rev 38558)
@@ -197,8 +197,8 @@
 	if(w>0 && h>0) {
 		float zoomx, zoomy, newzoom;
 
-		zoomx= (float)width/w;
-		zoomy= (float)height/h;
+		zoomx= (float)width/w/aspx;
+		zoomy= (float)height/h/aspy;
 
 		newzoom= 1.0f/power_of_2(1/MIN2(zoomx, zoomy));
 

Modified: branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c	2011-07-21 09:40:59 UTC (rev 38557)
+++ branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c	2011-07-21 09:47:33 UTC (rev 38558)
@@ -976,7 +976,7 @@
 {
 	/* identifiers */
 	ot->name= "Track Markers";
-	ot->description= "Track sleected markers";
+	ot->description= "Track selected markers";
 	ot->idname= "CLIP_OT_track_markers";
 
 	/* api callbacks */
@@ -1150,7 +1150,7 @@
 
 	/* identifiers */
 	ot->name= "Clear Track Path";
-	ot->description= "Clear path of active track";
+	ot->description= "Clear path of selected tracks";
 	ot->idname= "CLIP_OT_clear_track_path";
 
 	/* api callbacks */