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

[Sergey Sharybin]

Revision: 40564
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40564
Author:   nazgul
Date:     2011-09-26 11:08:23 +0000 (Mon, 26 Sep 2011)
Log Message:
-----------
Camera tracking integration
===========================

Renamed "Kayframe {1, 2}" to "Keyframe {A, B}"

Modified Paths:
--------------
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_clip.py
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_tracking.c

Modified: branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_clip.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_clip.py	2011-09-26 10:35:47 UTC (rev 40563)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_clip.py	2011-09-26 11:08:23 UTC (rev 40564)
@@ -157,8 +157,8 @@
         settings = clip.tracking.settings
 
         col = layout.column(align=True)
-        col.prop(settings, "keyframe1")
-        col.prop(settings, "keyframe2")
+        col.prop(settings, "keyframe_a")
+        col.prop(settings, "keyframe_b")
 
         col = layout.column(align=True)
         col.operator("clip.solve_camera")

Modified: branches/soc-2011-tomato/source/blender/makesrna/intern/rna_tracking.c
===================================================================
--- branches/soc-2011-tomato/source/blender/makesrna/intern/rna_tracking.c	2011-09-26 10:35:47 UTC (rev 40563)
+++ branches/soc-2011-tomato/source/blender/makesrna/intern/rna_tracking.c	2011-09-26 11:08:23 UTC (rev 40564)
@@ -279,17 +279,17 @@
 	RNA_def_property_range(prop, 0, 300);
 	RNA_def_property_ui_text(prop, "Margin", "Margin for markers from image boundary");
 
-	/* keyframe1 */
-	prop= RNA_def_property(srna, "keyframe1", PROP_INT, PROP_NONE);
+	/* keyframe_a */
+	prop= RNA_def_property(srna, "keyframe_a", PROP_INT, PROP_NONE);
 	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
 	RNA_def_property_int_sdna(prop, NULL, "keyframe1");
-	RNA_def_property_ui_text(prop, "Keyframe 1", "First keyframe used for reconstruction initialization");
+	RNA_def_property_ui_text(prop, "Keyframe A", "First keyframe used for reconstruction initialization");
 
-	/* keyframe2 */
-	prop= RNA_def_property(srna, "keyframe2", PROP_INT, PROP_NONE);
+	/* keyframe_b */
+	prop= RNA_def_property(srna, "keyframe_b", PROP_INT, PROP_NONE);
 	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
 	RNA_def_property_int_sdna(prop, NULL, "keyframe2");
-	RNA_def_property_ui_text(prop, "Keyframe 2", "Second keyframe used for reconstruction initialization");
+	RNA_def_property_ui_text(prop, "Keyframe B", "Second keyframe used for reconstruction initialization");
 
 	/* minmal correlation */
 	prop= RNA_def_property(srna, "min_correlation", PROP_FLOAT, PROP_NONE);