[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47623] trunk/blender/source/blender/ makesrna/intern/rna_tracking.c: Fixed issue with missed reconstruction error in clip editor header
Sergey Sharybin
sergey.vfx at gmail.com
Fri Jun 8 20:16:30 CEST 2012
Revision: 47623
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47623
Author: nazgul
Date: 2012-06-08 18:16:20 +0000 (Fri, 08 Jun 2012)
Log Message:
-----------
Fixed issue with missed reconstruction error in clip editor header
Actually was causes by error in RNA bindings which lead to empty reconstruction
returned for cameraObject.reconstruction.
Modified Paths:
--------------
trunk/blender/source/blender/makesrna/intern/rna_tracking.c
Modified: trunk/blender/source/blender/makesrna/intern/rna_tracking.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_tracking.c 2012-06-08 17:42:17 UTC (rev 47622)
+++ trunk/blender/source/blender/makesrna/intern/rna_tracking.c 2012-06-08 18:16:20 UTC (rev 47623)
@@ -338,6 +338,20 @@
}
}
+static PointerRNA rna_trackingObject_reconstruction_get(PointerRNA *ptr)
+{
+ MovieTrackingObject *object = (MovieTrackingObject* )ptr->data;
+
+ if (object->flag & TRACKING_OBJECT_CAMERA) {
+ MovieClip *clip = (MovieClip*)ptr->id.data;
+
+ return rna_pointer_inherit_refine(ptr, &RNA_MovieTrackingReconstruction, &clip->tracking.reconstruction);
+ }
+ else {
+ return rna_pointer_inherit_refine(ptr, &RNA_MovieTrackingReconstruction, &object->reconstruction);
+ }
+}
+
static PointerRNA rna_tracking_active_object_get(PointerRNA *ptr)
{
MovieClip *clip = (MovieClip*)ptr->id.data;
@@ -1330,6 +1344,7 @@
/* reconstruction */
prop = RNA_def_property(srna, "reconstruction", PROP_POINTER, PROP_NONE);
RNA_def_property_struct_type(prop, "MovieTrackingReconstruction");
+ RNA_def_property_pointer_funcs(prop, "rna_trackingObject_reconstruction_get", NULL, NULL, NULL);
/* scale */
prop = RNA_def_property(srna, "scale", PROP_FLOAT, PROP_NONE);
More information about the Bf-blender-cvs
mailing list