[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37025] branches/soc-2011-tomato/source/ blender: Camera tracking integration
Sergey Sharybin
g.ulairi at gmail.com
Mon May 30 16:55:36 CEST 2011
Revision: 37025
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37025
Author: nazgul
Date: 2011-05-30 14:55:35 +0000 (Mon, 30 May 2011)
Log Message:
-----------
Camera tracking integration
===========================
- Removed "Data" suffix from SfM DNA structures -- this suffix
wasn't very informative.
- Fixed crash when changing camera focal.
Modified Paths:
--------------
branches/soc-2011-tomato/source/blender/makesdna/DNA_movieclip_types.h
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_movieclip.c
Modified: branches/soc-2011-tomato/source/blender/makesdna/DNA_movieclip_types.h
===================================================================
--- branches/soc-2011-tomato/source/blender/makesdna/DNA_movieclip_types.h 2011-05-30 14:19:32 UTC (rev 37024)
+++ branches/soc-2011-tomato/source/blender/makesdna/DNA_movieclip_types.h 2011-05-30 14:55:35 UTC (rev 37025)
@@ -43,14 +43,14 @@
/* match-moving data */
-typedef struct MovieTrackingCameraData {
+typedef struct MovieTrackingCamera {
float focal; /* focal length */
float pad;
-} MovieTrackingCameraData;
+} MovieTrackingCamera;
-typedef struct MovieTrackingData {
- struct MovieTrackingCameraData camera;
-} MovieTrackingData;
+typedef struct MovieTracking {
+ struct MovieTrackingCamera camera;
+} MovieTracking;
/* clip data */
@@ -70,7 +70,7 @@
struct anim *anim; /* movie source data */
void *ibuf_cache; /* cache of ibufs, not in file */
- MovieTrackingData tracking; /* data for SfM tracking */
+ MovieTracking tracking; /* data for SfM tracking */
} MovieClip;
/* MovieClip->source */
Modified: branches/soc-2011-tomato/source/blender/makesrna/intern/rna_movieclip.c
===================================================================
--- branches/soc-2011-tomato/source/blender/makesrna/intern/rna_movieclip.c 2011-05-30 14:19:32 UTC (rev 37024)
+++ branches/soc-2011-tomato/source/blender/makesrna/intern/rna_movieclip.c 2011-05-30 14:55:35 UTC (rev 37025)
@@ -58,33 +58,33 @@
#else
-static void rna_def_movie_trackingCameraData(BlenderRNA *brna)
+static void rna_def_movie_trackingCamera(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;
- srna= RNA_def_struct(brna, "MovieTrackingCameraData", NULL);
+ srna= RNA_def_struct(brna, "MovieTrackingCamera", NULL);
RNA_def_struct_ui_text(srna, "Movie tracking camera data", "Match-moving camera data for tracking");
prop= RNA_def_property(srna, "focal_length", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "focal");
RNA_def_property_range(prop, 1.0f, 5000.0f);
RNA_def_property_ui_text(prop, "Focal Length", "Camera's focal length in millimeters");
- RNA_def_property_update(prop, NC_MOVIECLIP|ND_DISPLAY, "rna_MovieClip_reload_update");
+ RNA_def_property_update(prop, NC_MOVIECLIP|ND_DISPLAY, NULL);
}
-static void rna_def_movie_trackingData(BlenderRNA *brna)
+static void rna_def_movie_tracking(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;
- rna_def_movie_trackingCameraData(brna);
+ rna_def_movie_trackingCamera(brna);
- srna= RNA_def_struct(brna, "MovieTrackingData", NULL);
+ srna= RNA_def_struct(brna, "MovieTracking", NULL);
RNA_def_struct_ui_text(srna, "Movie tracking data", "Match-moving data for tracking");
prop= RNA_def_property(srna, "camera", PROP_POINTER, PROP_NONE);
- RNA_def_property_struct_type(prop, "MovieTrackingCameraData");
+ RNA_def_property_struct_type(prop, "MovieTrackingCamera");
}
static void rna_def_movieclip(BlenderRNA *brna)
@@ -92,7 +92,7 @@
StructRNA *srna;
PropertyRNA *prop;
- rna_def_movie_trackingData(brna);
+ rna_def_movie_tracking(brna);
srna= RNA_def_struct(brna, "MovieClip", "ID");
RNA_def_struct_ui_text(srna, "MovieClip", "MovieClip datablock referencing an external movie file");
@@ -104,7 +104,7 @@
RNA_def_property_update(prop, NC_MOVIECLIP|ND_DISPLAY, "rna_MovieClip_reload_update");
prop= RNA_def_property(srna, "tracking", PROP_POINTER, PROP_NONE);
- RNA_def_property_struct_type(prop, "MovieTrackingData");
+ RNA_def_property_struct_type(prop, "MovieTracking");
}
static void rna_def_movieclip_tools(BlenderRNA *brna)
More information about the Bf-blender-cvs
mailing list