[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60889] trunk/blender/release/scripts/ templates_py: minor changes to templates

[Campbell Barton]

Revision: 60889
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60889
Author:   campbellbarton
Date:     2013-10-22 00:25:15 +0000 (Tue, 22 Oct 2013)
Log Message:
-----------
minor changes to templates

Modified Paths:
--------------
    trunk/blender/release/scripts/templates_py/operator_modal_timer.py

Added Paths:
-----------
    trunk/blender/release/scripts/templates_py/operator_mesh_uv.py

Removed Paths:
-------------
    trunk/blender/release/scripts/templates_py/operator_uv.py

Copied: trunk/blender/release/scripts/templates_py/operator_mesh_uv.py (from rev 60886, trunk/blender/release/scripts/templates_py/operator_uv.py)
===================================================================
--- trunk/blender/release/scripts/templates_py/operator_mesh_uv.py	                        (rev 0)
+++ trunk/blender/release/scripts/templates_py/operator_mesh_uv.py	2013-10-22 00:25:15 UTC (rev 60889)
@@ -0,0 +1,50 @@
+import bpy
+import bmesh
+
+
+def main(context):
+    obj = context.active_object
+    me = obj.data
+    bm = bmesh.from_edit_mesh(me)
+
+    uv_layer = bm.loops.layers.uv.verify()
+    bm.faces.layers.tex.verify()  # currently blender needs both layers.
+
+    # adjust UVs
+    for f in bm.faces:
+        for l in f.loops:
+            luv = l[uv_layer]
+            if luv.select:
+                # apply the location of the vertex as a UV
+                luv.uv = l.vert.co.xy
+
+    bmesh.update_edit_mesh(me)
+
+
+class UvOperator(bpy.types.Operator):
+    """UV Operator description"""
+    bl_idname = "uv.simple_operator"
+    bl_label = "Simple UV Operator"
+
+    @classmethod
+    def poll(cls, context):
+        return (context.mode == 'EDIT_MESH')
+
+    def execute(self, context):
+        main(context)
+        return {'FINISHED'}
+
+
+def register():
+    bpy.utils.register_class(UvOperator)
+
+
+def unregister():
+    bpy.utils.unregister_class(UvOperator)
+
+
+if __name__ == "__main__":
+    register()
+
+    # test call
+    bpy.ops.uv.simple_operator()

Modified: trunk/blender/release/scripts/templates_py/operator_modal_timer.py
===================================================================
--- trunk/blender/release/scripts/templates_py/operator_modal_timer.py	2013-10-21 23:46:45 UTC (rev 60888)
+++ trunk/blender/release/scripts/templates_py/operator_modal_timer.py	2013-10-22 00:25:15 UTC (rev 60889)
@@ -9,7 +9,7 @@
     _timer = None
 
     def modal(self, context, event):
-        if event.type == 'ESC':
+        if event.type in {'RIGHTMOUSE', 'ESC'}:
             return self.cancel(context)
 
         if event.type == 'TIMER':
@@ -21,12 +21,14 @@
         return {'PASS_THROUGH'}
 
     def execute(self, context):
-        self._timer = context.window_manager.event_timer_add(0.1, context.window)
-        context.window_manager.modal_handler_add(self)
+        wm = context.window_manager
+        self._timer = wm.event_timer_add(0.1, context.window)
+        wm.modal_handler_add(self)
         return {'RUNNING_MODAL'}
 
     def cancel(self, context):
-        context.window_manager.event_timer_remove(self._timer)
+        wm = context.window_manager
+        wm.event_timer_remove(self._timer)
         return {'CANCELLED'}
 
 

Deleted: trunk/blender/release/scripts/templates_py/operator_uv.py
===================================================================
--- trunk/blender/release/scripts/templates_py/operator_uv.py	2013-10-21 23:46:45 UTC (rev 60888)
+++ trunk/blender/release/scripts/templates_py/operator_uv.py	2013-10-22 00:25:15 UTC (rev 60889)
@@ -1,50 +0,0 @@
-import bpy
-import bmesh
-
-
-def main(context):
-    obj = context.active_object
-    me = obj.data
-    bm = bmesh.from_edit_mesh(me)
-
-    uv_layer = bm.loops.layers.uv.verify()
-    bm.faces.layers.tex.verify()  # currently blender needs both layers.
-
-    # adjust UVs
-    for f in bm.faces:
-        for l in f.loops:
-            luv = l[uv_layer]
-            if luv.select:
-                # apply the location of the vertex as a UV
-                luv.uv = l.vert.co.xy
-
-    bmesh.update_edit_mesh(me)
-
-
-class UvOperator(bpy.types.Operator):
-    """UV Operator description"""
-    bl_idname = "uv.simple_operator"
-    bl_label = "Simple UV Operator"
-
-    @classmethod
-    def poll(cls, context):
-        return (context.mode == 'EDIT_MESH')
-
-    def execute(self, context):
-        main(context)
-        return {'FINISHED'}
-
-
-def register():
-    bpy.utils.register_class(UvOperator)
-
-
-def unregister():
-    bpy.utils.unregister_class(UvOperator)
-
-
-if __name__ == "__main__":
-    register()
-
-    # test call
-    bpy.ops.uv.simple_operator()