From 383da79d6301fdebcca8681f2d600d569feb8284 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Tue, 22 Oct 2013 00:25:15 +0000
Subject: [PATCH] minor changes to templates

---
 .../{operator_uv.py => operator_mesh_uv.py}            |  0
 release/scripts/templates_py/operator_modal_timer.py   | 10 ++++++----
 2 files changed, 6 insertions(+), 4 deletions(-)
 rename release/scripts/templates_py/{operator_uv.py => operator_mesh_uv.py} (100%)

diff --git a/release/scripts/templates_py/operator_uv.py b/release/scripts/templates_py/operator_mesh_uv.py
similarity index 100%
rename from release/scripts/templates_py/operator_uv.py
rename to release/scripts/templates_py/operator_mesh_uv.py
diff --git a/release/scripts/templates_py/operator_modal_timer.py b/release/scripts/templates_py/operator_modal_timer.py
index 3088d59fbcf..b8211126daf 100644
--- a/release/scripts/templates_py/operator_modal_timer.py
+++ b/release/scripts/templates_py/operator_modal_timer.py
@@ -9,7 +9,7 @@ class ModalTimerOperator(bpy.types.Operator):
     _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 @@ class ModalTimerOperator(bpy.types.Operator):
         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'}