Merged changes in the trunk up to revision 32124.
[blender-staging.git] / release / scripts / ui / properties_render.py
index 1da77a431b627100381fde36174ed6c2a83a2036..af59e29c0ca447a9d8ca6840b7dbc58150fd3c65 100644 (file)
@@ -797,8 +797,13 @@ class RENDER_PT_dimensions(RenderButtonsPanel, bpy.types.Panel):
         sub.prop(scene, "frame_step", text="Step")
 
         sub.label(text="Frame Rate:")
+
+        sub = col.column(align=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")
 
 
 class RENDER_PT_stamp(RenderButtonsPanel, bpy.types.Panel):