diff options
author | Ton Roosendaal <ton@blender.org> | 2010-12-29 21:21:57 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2010-12-29 21:21:57 +0300 |
commit | 7f3c7eee674bc2d2f985860bcb79c31dbde162e5 (patch) | |
tree | 4de6f0ed1be1b0e073cf3c96b340377c1445825e /source/blender/makesrna | |
parent | d36f15df0376ff4f587631c1254ef1b8227b7c3a (diff) |
Bugfix #25404
Frame Mapping (map old, map new) didn't set the the framelen
variable. Note that this feature is half-working, and on the
to. Might be removed/replaced with something better.
Diffstat (limited to 'source/blender/makesrna')
-rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 4470c49b50f..4906cbaef91 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -313,6 +313,12 @@ static void rna_Scene_view3d_update(Main *bmain, Scene *unused, PointerRNA *ptr) BKE_screen_view3d_main_sync(&bmain->screen, scene); } +static void rna_Scene_framelen_update(Main *bmain, Scene *scene, PointerRNA *ptr) +{ + scene->r.framelen= (float)scene->r.framapto/(float)scene->r.images; +} + + static void rna_Scene_current_frame_set(PointerRNA *ptr, int value) { Scene *data= (Scene*)ptr->data; @@ -2401,14 +2407,14 @@ static void rna_def_scene_render_data(BlenderRNA *brna) RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_range(prop, 1, 900); RNA_def_property_ui_text(prop, "Frame Map Old", "Specify old mapping value in frames"); - RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); + RNA_def_property_update(prop, NC_SCENE|ND_FRAME, "rna_Scene_framelen_update"); prop= RNA_def_property(srna, "frame_map_new", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "images"); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_range(prop, 1, 900); RNA_def_property_ui_text(prop, "Frame Map New", "Specify how many frames the Map Old will last"); - RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); + RNA_def_property_update(prop, NC_SCENE|ND_FRAME, "rna_Scene_framelen_update"); prop= RNA_def_property(srna, "dither_intensity", PROP_FLOAT, PROP_NONE); |