[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34489] trunk/blender/release/scripts: Adding Framerate preset patch by Troy Sobotka (sobotka).

[Daniel Salazar]

Revision: 34489
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34489
Author:   zanqdo
Date:     2011-01-25 18:30:31 +0000 (Tue, 25 Jan 2011)
Log Message:
-----------
Adding Framerate preset patch by Troy Sobotka (sobotka). Small change to
make Frame Old / Frame New remapping settings always visible as they
aren't really a part of framerate settings

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/properties_render.py

Added Paths:
-----------
    trunk/blender/release/scripts/presets/framerate/
    trunk/blender/release/scripts/presets/framerate/23.98.py
    trunk/blender/release/scripts/presets/framerate/24.py
    trunk/blender/release/scripts/presets/framerate/25.py
    trunk/blender/release/scripts/presets/framerate/29.97.py
    trunk/blender/release/scripts/presets/framerate/30.py
    trunk/blender/release/scripts/presets/framerate/50.py
    trunk/blender/release/scripts/presets/framerate/59.94.py
    trunk/blender/release/scripts/presets/framerate/60.py
    trunk/blender/release/scripts/presets/framerate/Custom.py

Added: trunk/blender/release/scripts/presets/framerate/23.98.py
===================================================================
--- trunk/blender/release/scripts/presets/framerate/23.98.py	                        (rev 0)
+++ trunk/blender/release/scripts/presets/framerate/23.98.py	2011-01-25 18:30:31 UTC (rev 34489)
@@ -0,0 +1,3 @@
+import bpy
+bpy.context.scene.render.fps = 24
+bpy.context.scene.render.fps_base = 1.001

Added: trunk/blender/release/scripts/presets/framerate/24.py
===================================================================
--- trunk/blender/release/scripts/presets/framerate/24.py	                        (rev 0)
+++ trunk/blender/release/scripts/presets/framerate/24.py	2011-01-25 18:30:31 UTC (rev 34489)
@@ -0,0 +1,3 @@
+import bpy
+bpy.context.scene.render.fps = 24
+bpy.context.scene.render.fps_base = 1

Added: trunk/blender/release/scripts/presets/framerate/25.py
===================================================================
--- trunk/blender/release/scripts/presets/framerate/25.py	                        (rev 0)
+++ trunk/blender/release/scripts/presets/framerate/25.py	2011-01-25 18:30:31 UTC (rev 34489)
@@ -0,0 +1,3 @@
+import bpy
+bpy.context.scene.render.fps = 25
+bpy.context.scene.render.fps_base = 1

Added: trunk/blender/release/scripts/presets/framerate/29.97.py
===================================================================
--- trunk/blender/release/scripts/presets/framerate/29.97.py	                        (rev 0)
+++ trunk/blender/release/scripts/presets/framerate/29.97.py	2011-01-25 18:30:31 UTC (rev 34489)
@@ -0,0 +1,3 @@
+import bpy
+bpy.context.scene.render.fps = 30
+bpy.context.scene.render.fps_base = 1.001

Added: trunk/blender/release/scripts/presets/framerate/30.py
===================================================================
--- trunk/blender/release/scripts/presets/framerate/30.py	                        (rev 0)
+++ trunk/blender/release/scripts/presets/framerate/30.py	2011-01-25 18:30:31 UTC (rev 34489)
@@ -0,0 +1,3 @@
+import bpy
+bpy.context.scene.render.fps = 30
+bpy.context.scene.render.fps_base = 1

Added: trunk/blender/release/scripts/presets/framerate/50.py
===================================================================
--- trunk/blender/release/scripts/presets/framerate/50.py	                        (rev 0)
+++ trunk/blender/release/scripts/presets/framerate/50.py	2011-01-25 18:30:31 UTC (rev 34489)
@@ -0,0 +1,3 @@
+import bpy
+bpy.context.scene.render.fps = 50
+bpy.context.scene.render.fps_base = 1

Added: trunk/blender/release/scripts/presets/framerate/59.94.py
===================================================================
--- trunk/blender/release/scripts/presets/framerate/59.94.py	                        (rev 0)
+++ trunk/blender/release/scripts/presets/framerate/59.94.py	2011-01-25 18:30:31 UTC (rev 34489)
@@ -0,0 +1,3 @@
+import bpy
+bpy.context.scene.render.fps = 60
+bpy.context.scene.render.fps_base = 1.001

Added: trunk/blender/release/scripts/presets/framerate/60.py
===================================================================
--- trunk/blender/release/scripts/presets/framerate/60.py	                        (rev 0)
+++ trunk/blender/release/scripts/presets/framerate/60.py	2011-01-25 18:30:31 UTC (rev 34489)
@@ -0,0 +1,3 @@
+import bpy
+bpy.context.scene.render.fps = 60
+bpy.context.scene.render.fps_base = 1

Added: trunk/blender/release/scripts/presets/framerate/Custom.py
===================================================================
--- trunk/blender/release/scripts/presets/framerate/Custom.py	                        (rev 0)
+++ trunk/blender/release/scripts/presets/framerate/Custom.py	2011-01-25 18:30:31 UTC (rev 34489)
@@ -0,0 +1 @@
+import bpy

Modified: trunk/blender/release/scripts/ui/properties_render.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_render.py	2011-01-25 17:08:43 UTC (rev 34488)
+++ trunk/blender/release/scripts/ui/properties_render.py	2011-01-25 18:30:31 UTC (rev 34489)
@@ -34,6 +34,13 @@
     draw = bpy.types.Menu.draw_preset
 
 
+class RENDER_MT_framerate_presets(bpy.types.Menu):
+    bl_label = "Frame Rate Presets"
+    preset_subdir = "framerate"
+    preset_operator = "script.execute_preset"
+    draw = bpy.types.Menu.draw_preset
+    
+    
 class RenderButtonsPanel():
     bl_space_type = 'PROPERTIES'
     bl_region_type = 'WINDOW'
@@ -555,8 +562,27 @@
         sub.prop(scene, "frame_step", text="Step")
 
         sub.label(text="Frame Rate:")
-        sub.prop(rd, "fps")
-        sub.prop(rd, "fps_base", text="/")
+        if rd.fps_base == 1:
+            fps_rate = round(rd.fps / rd.fps_base)
+        else:
+            fps_rate = round(rd.fps / rd.fps_base, 2)
+        
+        # TODO: Change the following to iterate over existing presets
+        if (fps_rate in (23.98, 24, 25, 29.97, 30, 50, 59.94, 60)):
+            custom_framerate = False
+        else:
+            custom_framerate = True
+        
+        if custom_framerate == True:
+            fps_label_text = "Custom (" + str(fps_rate) + " fps)"
+        else:
+            fps_label_text = str(fps_rate) + " fps"
+            
+        sub.menu("RENDER_MT_framerate_presets", text=fps_label_text)
+        
+        if (bpy.types.RENDER_MT_framerate_presets.bl_label == "Custom") or (custom_framerate == True):
+            sub.prop(rd, "fps")
+            sub.prop(rd, "fps_base", text="/")
         subrow = sub.row(align=True)
         subrow.prop(rd, "frame_map_old", text="Old")
         subrow.prop(rd, "frame_map_new", text="New")