diff options
| -rw-r--r-- | release/scripts/presets/framerate/120.py | 3 | ||||
| -rw-r--r-- | release/scripts/presets/framerate/240.py | 3 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_output.py | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 2 |
4 files changed, 8 insertions, 2 deletions
diff --git a/release/scripts/presets/framerate/120.py b/release/scripts/presets/framerate/120.py new file mode 100644 index 00000000000..53328907d2b --- /dev/null +++ b/release/scripts/presets/framerate/120.py @@ -0,0 +1,3 @@ +import bpy +bpy.context.scene.render.fps = 120 +bpy.context.scene.render.fps_base = 1 diff --git a/release/scripts/presets/framerate/240.py b/release/scripts/presets/framerate/240.py new file mode 100644 index 00000000000..096af4e38ec --- /dev/null +++ b/release/scripts/presets/framerate/240.py @@ -0,0 +1,3 @@ +import bpy +bpy.context.scene.render.fps = 240 +bpy.context.scene.render.fps_base = 1 diff --git a/release/scripts/startup/bl_ui/properties_output.py b/release/scripts/startup/bl_ui/properties_output.py index 69c557d336f..75c1f69f84f 100644 --- a/release/scripts/startup/bl_ui/properties_output.py +++ b/release/scripts/startup/bl_ui/properties_output.py @@ -80,7 +80,7 @@ class RENDER_PT_dimensions(RenderOutputButtonsPanel, Panel): fps_rate = round(fps / fps_base, 2) # TODO: Change the following to iterate over existing presets - custom_framerate = (fps_rate not in {23.98, 24, 25, 29.97, 30, 50, 59.94, 60}) + custom_framerate = (fps_rate not in {23.98, 24, 25, 29.97, 30, 50, 59.94, 60, 120, 240}) if custom_framerate is True: fps_label_text = tip_("Custom (%.4g fps)") % fps_rate diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index b9fc89db0d1..1ac224b27e4 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -5977,7 +5977,7 @@ static void rna_def_scene_render_data(BlenderRNA *brna) RNA_def_property_int_sdna(prop, NULL, "frs_sec"); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_range(prop, 1, SHRT_MAX); - RNA_def_property_ui_range(prop, 1, 120, 1, -1); + RNA_def_property_ui_range(prop, 1, 240, 1, -1); RNA_def_property_ui_text(prop, "FPS", "Framerate, expressed in frames per second"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_Scene_fps_update"); |