Revision: 43748
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43748
Author:   dingto
Date:     2012-01-29 10:21:28 +0000 (Sun, 29 Jan 2012)
Log Message:
-----------
Fix for [#30015] Keyframed Resolution Unpredictable
* Disabled possibility to keyframe render resolution, percentage and border 
render properties. Animating them does not makes much sense. Discussed with 
Sergey in IRC. 

Modified Paths:
--------------
    trunk/blender/source/blender/makesrna/intern/rna_scene.c

Modified: trunk/blender/source/blender/makesrna/intern/rna_scene.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_scene.c    2012-01-28 
13:53:17 UTC (rev 43747)
+++ trunk/blender/source/blender/makesrna/intern/rna_scene.c    2012-01-29 
10:21:28 UTC (rev 43748)
@@ -3154,18 +3154,21 @@
 
        prop= RNA_def_property(srna, "resolution_x", PROP_INT, PROP_NONE);
        RNA_def_property_int_sdna(prop, NULL, "xsch");
+       RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
        RNA_def_property_range(prop, 4, 10000);
        RNA_def_property_ui_text(prop, "Resolution X", "Number of horizontal 
pixels in the rendered image");
        RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, 
"rna_SceneCamera_update");
        
        prop= RNA_def_property(srna, "resolution_y", PROP_INT, PROP_NONE);
        RNA_def_property_int_sdna(prop, NULL, "ysch");
+       RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
        RNA_def_property_range(prop, 4, 10000);
        RNA_def_property_ui_text(prop, "Resolution Y", "Number of vertical 
pixels in the rendered image");
        RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, 
"rna_SceneCamera_update");
        
        prop= RNA_def_property(srna, "resolution_percentage", PROP_INT, 
PROP_PERCENTAGE);
        RNA_def_property_int_sdna(prop, NULL, "size");
+       RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
        RNA_def_property_range(prop, 1, SHRT_MAX);
        RNA_def_property_ui_range(prop, 1, 100, 10, 1);
        RNA_def_property_ui_text(prop, "Resolution %", "Percentage scale for 
render resolution");
@@ -3185,12 +3188,14 @@
        
        prop= RNA_def_property(srna, "pixel_aspect_x", PROP_FLOAT, PROP_NONE);
        RNA_def_property_float_sdna(prop, NULL, "xasp");
+       RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
        RNA_def_property_range(prop, 1.0f, 200.0f);
        RNA_def_property_ui_text(prop, "Pixel Aspect X", "Horizontal aspect 
ratio - for anamorphic or non-square pixel output");
        RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, 
"rna_SceneCamera_update");
        
        prop= RNA_def_property(srna, "pixel_aspect_y", PROP_FLOAT, PROP_NONE);
        RNA_def_property_float_sdna(prop, NULL, "yasp");
+       RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
        RNA_def_property_range(prop, 1.0f, 200.0f);
        RNA_def_property_ui_text(prop, "Pixel Aspect Y", "Vertical aspect ratio 
- for anamorphic or non-square pixel output");
        RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, 
"rna_SceneCamera_update");
@@ -3404,6 +3409,7 @@
        /* border */
        prop= RNA_def_property(srna, "use_border", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "mode", R_BORDER);
+       RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
        RNA_def_property_ui_text(prop, "Border",
                                 "Render a user-defined border region, within 
the frame size "
                                 "(note that this disables save_buffers and 
full_sample)");
@@ -3435,6 +3441,7 @@
        
        prop= RNA_def_property(srna, "use_crop_to_border", PROP_BOOLEAN, 
PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "mode", R_CROP);
+       RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
        RNA_def_property_ui_text(prop, "Crop to Border", "Crop the rendered 
frame to the defined border size");
        RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL);
        

_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to