- aspectx wasnt saved in the render preset

- define a preset base class
- cleanup some comments and whitespace

6 files changed, 74 insertions, 44 deletions

diff --git a/release/scripts/op/console_python.py b/release/scripts/op/console_python.py
index ec700798b02..532602655fa 100644
--- a/release/scripts/op/console_python.py
+++ b/release/scripts/op/console_python.py
@@ -142,7 +142,7 @@ def autocomplete(context):
     sc = context.space_data
 
     console = get_console(hash(context.region))[0]
-    
+
     current_line = sc.history[-1]
     line = current_line.line
 
diff --git a/release/scripts/op/console_shell.py b/release/scripts/op/console_shell.py
index 60768693030..7262a434a51 100644
--- a/release/scripts/op/console_shell.py
+++ b/release/scripts/op/console_shell.py
@@ -51,11 +51,11 @@ def execute(context):
         line = sc.history[-1].line
     except:
         return ('CANCELLED',)
-        
+
     bpy.ops.console.scrollback_append(text=sc.prompt + line, type='INPUT')
-    
+
     shell_run(line)
-    
+
     # insert a new blank line
     bpy.ops.console.history_append(text="", current_character=0,
         remove_duplicates=True)
@@ -72,7 +72,7 @@ def autocomplete(context):
 
 def banner(context):
     sc = context.space_data
-    
+
     shell_run("bash --version")
     sc.prompt = os.getcwd()+PROMPT
 
diff --git a/release/scripts/op/mesh.py b/release/scripts/op/mesh.py
index f78e33730f0..0e57bc440d1 100644
--- a/release/scripts/op/mesh.py
+++ b/release/scripts/op/mesh.py
@@ -4,12 +4,12 @@
 #  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.
@@ -26,12 +26,12 @@ def main(context):
         bpy.ops.object.mode_set(mode='OBJECT', toggle=False)
 
     mesh = ob.data
-    
+
     face_list = [face for face in mesh.faces]
     face_edge_keys = [face.edge_keys for face in face_list]
 
     edge_face_count = mesh.edge_face_count_dict
-    
+
     def test_interior(index):
         for key in face_edge_keys[index]:
             if edge_face_count[key] < 3:
diff --git a/release/scripts/op/preset_render.py b/release/scripts/op/preset_render.py
index 0077430eb3b..8198cbde820 100644
--- a/release/scripts/op/preset_render.py
+++ b/release/scripts/op/preset_render.py
@@ -19,47 +19,28 @@
 import bpy
 import os
 
-class AddPreset(bpy.types.Operator):
-    '''Add a Render Preset'''
+from wm import AddPresetBase
+
+
+class AddPresetRender(AddPresetBase):
     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 = [
+
+    name = AddPresetBase.name
+
+    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.pixel_aspect_y",
         "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',)
+    preset_path = os.path.join("presets", "render")
+
+
+bpy.ops.add(AddPresetRender)
 
-    def invoke(self, context, event):
-        wm = context.manager
-        wm.invoke_props_popup(self, event)
-        return ('RUNNING_MODAL',)
 
-bpy.ops.add(AddPreset)
diff --git a/release/scripts/op/vertexpaint_dirt.py b/release/scripts/op/vertexpaint_dirt.py
index bd052e909b6..585a2231e21 100644
--- a/release/scripts/op/vertexpaint_dirt.py
+++ b/release/scripts/op/vertexpaint_dirt.py
@@ -175,4 +175,4 @@ class VertexPaintDirt(bpy.types.Operator):
 bpy.ops.add(VertexPaintDirt)
 
 if __name__ == "__main__":
-    bpy.ops.mesh.vertex_paint_dirt()
\ No newline at end of file
+    bpy.ops.mesh.vertex_paint_dirt()
diff --git a/release/scripts/op/wm.py b/release/scripts/op/wm.py
index 1f660dbeb35..f6239e146b8 100644
--- a/release/scripts/op/wm.py
+++ b/release/scripts/op/wm.py
@@ -4,12 +4,12 @@
 #  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.
@@ -19,6 +19,7 @@
 # <pep8-80 compliant>
 
 import bpy
+import os
 
 from bpy.props import *
 
@@ -391,6 +392,54 @@ class WM_OT_reload_scripts(bpy.types.Operator):
         '''
         return ('FINISHED',)
 
+class AddPresetBase(bpy.types.Operator):
+    '''Base preset class, only for subclassing
+    subclasses must define 
+     - preset_values
+     - preset_path '''
+    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_y",
+        "bpy.context.scene.render_data.fps",
+        "bpy.context.scene.render_data.fps_base",
+        "bpy.context.scene.render_data.resolution_percentage",
+    ]
+    
+    preset_path = os.path.join("presets", "render")
+    '''
+    
+    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, self.preset_path, filename)
+
+        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(MESH_OT_delete_edgeloop)
 
 bpy.ops.add(WM_OT_context_set_boolean)