svn merge ^/trunk/blender -r44076:44118

2 files changed, 11 insertions, 8 deletions

diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index 9a94a98bfaf..7dc721930ef 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -823,16 +823,16 @@ static void rna_SceneRender_file_ext_get(PointerRNA *ptr, char *str)
 #ifdef WITH_QUICKTIME
 static int rna_RenderSettings_qtcodecsettings_codecType_get(PointerRNA *ptr)
 {
-	RenderData *rd= (RenderData*)ptr->data;
+	QuicktimeCodecSettings *settings = (QuicktimeCodecSettings*)ptr->data;
 	
-	return quicktime_rnatmpvalue_from_videocodectype(rd->qtcodecsettings.codecType);
+	return quicktime_rnatmpvalue_from_videocodectype(settings->codecType);
 }
 
 static void rna_RenderSettings_qtcodecsettings_codecType_set(PointerRNA *ptr, int value)
 {
-	RenderData *rd= (RenderData*)ptr->data;
+	QuicktimeCodecSettings *settings = (QuicktimeCodecSettings*)ptr->data;
 
-	rd->qtcodecsettings.codecType = quicktime_videocodecType_from_rnatmpvalue(value);
+	settings->codecType = quicktime_videocodecType_from_rnatmpvalue(value);
 }
 
 static EnumPropertyItem *rna_RenderSettings_qtcodecsettings_codecType_itemf(bContext *C, PointerRNA *ptr,
@@ -865,16 +865,16 @@ static EnumPropertyItem *rna_RenderSettings_qtcodecsettings_codecType_itemf(bCon
 #ifdef USE_QTKIT
 static int rna_RenderSettings_qtcodecsettings_audiocodecType_get(PointerRNA *ptr)
 {
-	RenderData *rd= (RenderData*)ptr->data;
+	QuicktimeCodecSettings *settings = (QuicktimeCodecSettings*)ptr->data;
 	
-	return quicktime_rnatmpvalue_from_audiocodectype(rd->qtcodecsettings.audiocodecType);
+	return quicktime_rnatmpvalue_from_audiocodectype(settings->audiocodecType);
 }
 
 static void rna_RenderSettings_qtcodecsettings_audiocodecType_set(PointerRNA *ptr, int value)
 {
-	RenderData *rd= (RenderData*)ptr->data;
+	QuicktimeCodecSettings *settings = (QuicktimeCodecSettings*)ptr->data;
 	
-	rd->qtcodecsettings.audiocodecType = quicktime_audiocodecType_from_rnatmpvalue(value);
+	settings->audiocodecType = quicktime_audiocodecType_from_rnatmpvalue(value);
 }
 
 static EnumPropertyItem *rna_RenderSettings_qtcodecsettings_audiocodecType_itemf(bContext *C, PointerRNA *ptr,
diff --git a/source/blender/makesrna/intern/rna_tracking.c b/source/blender/makesrna/intern/rna_tracking.c
index 993c0ca0bde..aff8a85dd26 100644
--- a/source/blender/makesrna/intern/rna_tracking.c
+++ b/source/blender/makesrna/intern/rna_tracking.c
@@ -546,6 +546,7 @@ static void rna_def_trackingSettings(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "distance", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
 	RNA_def_property_float_sdna(prop, NULL, "dist");
+	RNA_def_property_float_default(prop, 1.0f);
 	RNA_def_property_ui_text(prop, "Distance", "Distance between two bundles used for scene scaling");
 
 	/* frames count */
@@ -665,6 +666,7 @@ static void rna_def_trackingSettings(BlenderRNA *brna)
 	RNA_def_property_float_sdna(prop, NULL, "object_distance");
 	RNA_def_property_ui_text(prop, "Distance", "Distance between two bundles used for object scaling");
 	RNA_def_property_range(prop, 0.001, 10000);
+	RNA_def_property_float_default(prop, 1.0f);
 	RNA_def_property_ui_range(prop, 0.001, 10000.0, 1, 3);
 }
 
@@ -1227,6 +1229,7 @@ static void rna_def_trackingObject(BlenderRNA *brna)
 	RNA_def_property_float_sdna(prop, NULL, "scale");
 	RNA_def_property_range(prop, 0.0001f, 10000.0f);
 	RNA_def_property_ui_range(prop, 0.0001f, 10000.0, 1, 4);
+	RNA_def_property_float_default(prop, 1.0f);
 	RNA_def_property_ui_text(prop, "Scale", "Scale of object solution in camera space");
 	RNA_def_property_update(prop, NC_MOVIECLIP|NA_EDITED, "rna_trackingObject_flushUpdate");
 }