[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25700] trunk/blender/release/scripts/op/ wm.py: WM_OT_context_set_* - more compact and check for the relative option without exception handling .

[Campbell Barton]

Revision: 25700
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25700
Author:   campbellbarton
Date:     2010-01-04 09:24:24 +0100 (Mon, 04 Jan 2010)

Log Message:
-----------
WM_OT_context_set_* - more compact and check for the relative option without exception handling.

Modified Paths:
--------------
    trunk/blender/release/scripts/op/wm.py

Modified: trunk/blender/release/scripts/op/wm.py
===================================================================
--- trunk/blender/release/scripts/op/wm.py	2010-01-04 04:26:52 UTC (rev 25699)
+++ trunk/blender/release/scripts/op/wm.py	2010-01-04 08:24:24 UTC (rev 25700)
@@ -42,6 +42,8 @@
 rna_reverse_prop = BoolProperty(name="Reverse",
         description="Cycle backwards", default=False)
 
+rna_relative_prop = BoolProperty(name="Relative",
+        description="Apply relative to the current value (delta)", default=False)
 
 def context_path_validate(context, path):
     import sys
@@ -61,15 +63,12 @@
 def execute_context_assign(self, context):
     if context_path_validate(context, self.properties.path) is Ellipsis:
         return {'PASS_THROUGH'}
-    
-    try:
-        if self.properties.relative:
-            exec("context.%s+=self.properties.value" % self.properties.path)
-            return {'FINISHED'}
-    except AttributeError:
-        pass    # no relative property exists
-        
-    exec("context.%s=self.properties.value" % self.properties.path)
+
+    if getattr(self.properties, "relative", False):
+        exec("context.%s+=self.properties.value" % self.properties.path)
+    else:
+        exec("context.%s=self.properties.value" % self.properties.path)
+
     return {'FINISHED'}
 
 
@@ -94,8 +93,7 @@
 
     path = rna_path_prop
     value = IntProperty(name="Value", description="Assign value", default=0)
-    relative = BoolProperty(name="Relative", 
-        description="Apply the value as a relative difference", default=False)
+    relative = rna_relative_prop
 
     execute = execute_context_assign
 
@@ -108,8 +106,7 @@
 
     path = rna_path_prop
     value = FloatProperty(name="Value", description="Assignment value", default=0.0)
-    relative = BoolProperty(name="Relative", 
-        description="Apply the value as a relative difference", default=False)
+    relative = rna_relative_prop
 
     execute = execute_context_assign