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

[Sergey Sharybin]

Revision: 40497
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40497
Author:   nazgul
Date:     2011-09-23 13:35:53 +0000 (Fri, 23 Sep 2011)
Log Message:
-----------
Camera tracking integration
===========================

Code and tool-tips clean-up

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

Modified: branches/soc-2011-tomato/source/blender/editors/space_clip/clip_buttons.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/space_clip/clip_buttons.c	2011-09-23 13:31:48 UTC (rev 40496)
+++ branches/soc-2011-tomato/source/blender/editors/space_clip/clip_buttons.c	2011-09-23 13:35:53 UTC (rev 40497)
@@ -355,7 +355,7 @@
 	if(compact) {
 		block= uiLayoutGetBlock(layout);
 
-		bt= uiDefIconButBitI(block, TOGN, MARKER_DISABLED, 0, ICON_MUTE_IPO_OFF, 0, 0, 20, 20, &cb->marker_flag, 0, 0, 1, 0, "Marker is disabled for current frame.");
+		bt= uiDefIconButBitI(block, TOGN, MARKER_DISABLED, 0, ICON_RESTRICT_VIEW_OFF, 0, 0, 20, 20, &cb->marker_flag, 0, 0, 1, 0, "Marker is disabled for current frame.");
 		uiButSetNFunc(bt, marker_update_cb, cb, NULL);
 	} else {
 		int width, height, step, digits;

Modified: branches/soc-2011-tomato/source/blender/editors/space_clip/clip_ops.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/space_clip/clip_ops.c	2011-09-23 13:31:48 UTC (rev 40496)
+++ branches/soc-2011-tomato/source/blender/editors/space_clip/clip_ops.c	2011-09-23 13:35:53 UTC (rev 40497)
@@ -425,7 +425,7 @@
 
 	/* properties */
 	RNA_def_float_vector(ot->srna, "offset", 2, NULL, -FLT_MAX, FLT_MAX,
-		"Offset", "Offset in floating point units, 1.0 is the width and height of the image.", -FLT_MAX, FLT_MAX);
+		"Offset", "Offset in floating point units, 1.0 is the width and height of the image", -FLT_MAX, FLT_MAX);
 }
 
 /********************** view zoom operator *********************/
@@ -547,7 +547,7 @@
 
 	/* properties */
 	RNA_def_float(ot->srna, "factor", 0.0f, 0.0f, FLT_MAX,
-		"Factor", "Zoom factor, values higher than 1.0 zoom in, lower values zoom out.", -FLT_MAX, FLT_MAX);
+		"Factor", "Zoom factor, values higher than 1.0 zoom in, lower values zoom out", -FLT_MAX, FLT_MAX);
 }
 
 /********************** view zoom in/out operator *********************/
@@ -664,7 +664,7 @@
 
 	/* properties */
 	RNA_def_float(ot->srna, "ratio", 0.0f, 0.0f, FLT_MAX,
-		"Ratio", "Zoom ratio, 1.0 is 1:1, higher is zoomed in, lower is zoomed out.", -FLT_MAX, FLT_MAX);
+		"Ratio", "Zoom ratio, 1.0 is 1:1, higher is zoomed in, lower is zoomed out", -FLT_MAX, FLT_MAX);
 }
 
 /********************** view all operator *********************/

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-09-23 13:31:48 UTC (rev 40496)
+++ branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c	2011-09-23 13:35:53 UTC (rev 40497)
@@ -177,7 +177,7 @@
 
 	/* properties */
 	RNA_def_float_vector(ot->srna, "location", 2, NULL, -FLT_MIN, FLT_MAX,
-		"Location", "Location of marker on frame.", -1.f, 1.f);
+		"Location", "Location of marker on frame", -1.f, 1.f);
 }
 
 /********************** delete track operator *********************/
@@ -664,7 +664,7 @@
 
 	/* properties */
 	RNA_def_float_vector(ot->srna, "offset", 2, NULL, -FLT_MAX, FLT_MAX,
-		"Offset", "Offset in floating point units, 1.0 is the width and height of the image.", -FLT_MAX, FLT_MAX);
+		"Offset", "Offset in floating point units, 1.0 is the width and height of the image", -FLT_MAX, FLT_MAX);
 }
 
 /********************** mouse select operator *********************/
@@ -851,9 +851,9 @@
 
 	/* properties */
 	RNA_def_boolean(ot->srna, "extend", 0,
-		"Extend", "Extend selection rather than clearing the existing selection.");
+		"Extend", "Extend selection rather than clearing the existing selection");
 	RNA_def_float_vector(ot->srna, "location", 2, NULL, -FLT_MAX, FLT_MAX,
-		"Location", "Mouse location in normalized coordinates, 0.0 to 1.0 is within the image bounds.", -100.0f, 100.0f);
+		"Location", "Mouse location in normalized coordinates, 0.0 to 1.0 is within the image bounds", -100.0f, 100.0f);
 }
 
 /********************** border select operator *********************/
@@ -2084,7 +2084,7 @@
 
 	/* properties */
 	RNA_def_float(ot->srna, "distance", 0.0f, -FLT_MAX, FLT_MAX,
-		"Distance", "Distance between selected tracks.", -100.0f, 100.0f);
+		"Distance", "Distance between selected tracks", -100.0f, 100.0f);
 }
 
 /********************** set principal center operator *********************/
@@ -2873,7 +2873,7 @@
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 
 	/* properties */
-	RNA_def_int(ot->srna, "frames", 0, 0, INT_MAX, "Tracked Frames", "Affect on tracks which are tracked less than specified amount of frames.", 0, INT_MAX);
-	RNA_def_float(ot->srna, "error", 0.0f, 0.f, FLT_MAX, "Reprojection Error", "Affect on tracks with have got larger reprojection error.", 0.f, 100.0f);
-	RNA_def_enum(ot->srna, "action", actions_items, 0, "Action", "Cleanup action to execute.");
+	RNA_def_int(ot->srna, "frames", 0, 0, INT_MAX, "Tracked Frames", "Affect on tracks which are tracked less than specified amount of frames", 0, INT_MAX);
+	RNA_def_float(ot->srna, "error", 0.0f, 0.f, FLT_MAX, "Reprojection Error", "Affect on tracks with have got larger reprojection error", 0.f, 100.0f);
+	RNA_def_enum(ot->srna, "action", actions_items, 0, "Action", "Cleanup action to execute");
 }