[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24737] trunk/blender/release/scripts: * Some cleanup for recent preset commit.
Thomas Dinges
dingto at gmx.de
Sat Nov 21 23:54:03 CET 2009
Revision: 24737
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24737
Author: dingto
Date: 2009-11-21 23:54:02 +0100 (Sat, 21 Nov 2009)
Log Message:
-----------
* Some cleanup for recent preset commit.
* Minor align fix for Frame Rate Buttons.
Modified Paths:
--------------
trunk/blender/release/scripts/ui/properties_render.py
Added Paths:
-----------
trunk/blender/release/scripts/op/preset_render.py
Removed Paths:
-------------
trunk/blender/release/scripts/op/render.py
trunk/blender/release/scripts/presets/render/my preset_py
Copied: trunk/blender/release/scripts/op/preset_render.py (from rev 24735, trunk/blender/release/scripts/op/render.py)
===================================================================
--- trunk/blender/release/scripts/op/preset_render.py (rev 0)
+++ trunk/blender/release/scripts/op/preset_render.py 2009-11-21 22:54:02 UTC (rev 24737)
@@ -0,0 +1,65 @@
+# ##### BEGIN GPL LICENSE BLOCK #####
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# ##### END GPL LICENSE BLOCK #####
+
+import bpy
+import os
+
+class AddPreset(bpy.types.Operator):
+ '''Add a Render Preset'''
+ bl_idname = "render.preset_add"
+ bl_label = "Add Render Preset"
+
+ name = bpy.props.StringProperty(name="Name", description="Name of the preset, used to make the path name", maxlen= 64, default= "New Preset")
+
+ _preset_values = [
+ "bpy.context.scene.render_data.resolution_x",
+ "bpy.context.scene.render_data.resolution_y",
+ "bpy.context.scene.render_data.pixel_aspect_x",
+ "bpy.context.scene.render_data.pixel_aspect_x",
+ "bpy.context.scene.render_data.fps",
+ "bpy.context.scene.render_data.fps_base",
+ "bpy.context.scene.render_data.resolution_percentage",
+ ]
+
+ _last_preset = "" # hack to avoid remaking
+
+ def _as_filename(self, name): # could reuse for other presets
+ for char in " !@#$%^&*(){}:\";'[]<>,./?":
+ name = name.replace('.', '_')
+ return name.lower()
+
+ def execute(self, context):
+ filename = self._as_filename(self.properties.name) + ".py"
+
+ target_path = os.path.join(os.path.dirname(__file__), os.path.pardir, "presets", "render", filename)
+ print(target_path)
+ file_preset = open(target_path, 'w')
+
+ for rna_path in self._preset_values:
+ file_preset.write("%s = %s\n" % (rna_path, eval(rna_path)))
+
+ file_preset.close()
+
+ return ('FINISHED',)
+
+ def invoke(self, context, event):
+ wm = context.manager
+ wm.invoke_props_popup(self, event)
+ return ('RUNNING_MODAL',)
+
+bpy.ops.add(AddPreset)
Deleted: trunk/blender/release/scripts/op/render.py
===================================================================
--- trunk/blender/release/scripts/op/render.py 2009-11-21 22:45:25 UTC (rev 24736)
+++ trunk/blender/release/scripts/op/render.py 2009-11-21 22:54:02 UTC (rev 24737)
@@ -1,66 +0,0 @@
-# ##### BEGIN GPL LICENSE BLOCK #####
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# ##### END GPL LICENSE BLOCK #####
-
-import bpy
-import os
-
-class AddPreset(bpy.types.Operator):
- '''Add a torus mesh.'''
- bl_idname = "render.preset_add"
- bl_label = "Add Render Preset"
-
- name = bpy.props.StringProperty(name="Name", description="Name of the preset, used to make the path name", maxlen= 64, default= "New Preset")
-
- _preset_values = [
- "bpy.context.scene.render_data.resolution_x",
- "bpy.context.scene.render_data.resolution_y",
- "bpy.context.scene.render_data.pixel_aspect_x",
- "bpy.context.scene.render_data.pixel_aspect_x",
- "bpy.context.scene.render_data.fps",
- "bpy.context.scene.render_data.fps_base",
- "bpy.context.scene.render_data.resolution_percentage",
- ]
-
- _last_preset = "" # hack to avoid remaking
-
- def _as_filename(self, name): # could reuse for other presets
- for char in " !@#$%^&*(){}:\";'[]<>,./?":
- name = name.replace('.', '_')
- return name.lower()
-
- def execute(self, context):
-
- filename = self._as_filename(self.properties.name) + ".py"
-
- target_path = os.path.join(os.path.dirname(__file__), os.path.pardir, "presets", "render", filename)
- print(target_path)
- file_preset = open(target_path, 'w')
-
- for rna_path in self._preset_values:
- file_preset.write("%s = %s\n" % (rna_path, eval(rna_path)))
-
- file_preset.close()
-
- return ('FINISHED',)
-
- def invoke(self, context, event):
- wm = context.manager
- wm.invoke_props_popup(self, event)
- return ('RUNNING_MODAL',)
-
-bpy.ops.add(AddPreset)
Deleted: trunk/blender/release/scripts/presets/render/my preset_py
===================================================================
--- trunk/blender/release/scripts/presets/render/my preset_py 2009-11-21 22:45:25 UTC (rev 24736)
+++ trunk/blender/release/scripts/presets/render/my preset_py 2009-11-21 22:54:02 UTC (rev 24737)
@@ -1,6 +0,0 @@
-bpy.context.scene.render_data.resolution_x = 1920
-bpy.context.scene.render_data.resolution_y = 1080
-bpy.context.scene.render_data.pixel_aspect_x = 100.0
-bpy.context.scene.render_data.pixel_aspect_x = 100.0
-bpy.context.scene.render_data.fps = 24
-bpy.context.scene.render_data.fps_base = 1.0
Modified: trunk/blender/release/scripts/ui/properties_render.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_render.py 2009-11-21 22:45:25 UTC (rev 24736)
+++ trunk/blender/release/scripts/ui/properties_render.py 2009-11-21 22:54:02 UTC (rev 24737)
@@ -481,6 +481,12 @@
scene = context.scene
rd = scene.render_data
wide_ui = context.region.width > narrowui
+
+ row = layout.row().split()
+ sub = row.row(align=True).split(percentage=0.75)
+ sub.itemM("RENDER_MT_presets", text="Presets")
+ sub.itemO("render.preset_add", text="Add")
+ row.itemL()
split = layout.split()
@@ -509,17 +515,11 @@
sub.itemR(scene, "end_frame", text="End")
sub.itemR(scene, "frame_step", text="Step")
- sub = col.column(align=True)
sub.itemL(text="Frame Rate:")
sub.itemR(rd, "fps")
- sub.itemR(rd, "fps_base", text="/")
+ sub.itemR(rd, "fps_base", text="/")
- sub = col.split(percentage=0.75)
- sub.itemM("RENDER_MT_presets", text="Presets")
- sub.itemO("render.preset_add", text="Add")
-
-
class RENDER_PT_stamp(RenderButtonsPanel):
bl_label = "Stamp"
bl_default_closed = True
More information about the Bf-blender-cvs
mailing list