Merged changes in the trunk up to revision 41768.
[blender-staging.git] / source / blender / makesrna / intern / rna_scene.c
index 24b704464682bbf5fbf81a69f29bf856cbb5dceb..9c4a09845966ea6b3530ede53011958e9f1d9b0f 100644 (file)
@@ -576,6 +576,7 @@ static int rna_SceneRender_file_ext_length(PointerRNA *ptr)
 static void rna_SceneRender_file_ext_get(PointerRNA *ptr, char *str)
 {
        RenderData *rd= (RenderData*)ptr->data;
+       str[0]= '\0';
        BKE_add_image_extension(str, rd->imtype);
 }
 
@@ -3467,7 +3468,7 @@ static void rna_def_scene_render_data(BlenderRNA *brna)
        
        prop= RNA_def_property(srna, "use_full_sample", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "scemode", R_FULL_SAMPLE);
-        RNA_def_property_boolean_funcs(prop, "rna_RenderSettings_full_sample_get", NULL);
+       RNA_def_property_boolean_funcs(prop, "rna_RenderSettings_full_sample_get", NULL);
        RNA_def_property_ui_text(prop, "Full Sample",
                                 "Save for every anti-aliasing sample the entire RenderLayer results "
                                 "(this solves anti-aliasing issues with compositing)");