merge with trunk at r31523

1 files changed, 3 insertions, 7 deletions

diff --git a/release/scripts/templates/operator_simple.py b/release/scripts/templates/operator_simple.py
index 985a628c2d0..853bfa666eb 100644
--- a/release/scripts/templates/operator_simple.py
+++ b/release/scripts/templates/operator_simple.py
@@ -9,18 +9,14 @@ class SimpleOperator(bpy.types.Operator):
     bl_idname = "object.simple_operator"
     bl_label = "Simple Object Operator"
 
-    def poll(self, context):
+    @classmethod
+    def poll(cls, context):
         return context.active_object != None
 
     def execute(self, context):
         main(context)
         return {'FINISHED'}
 
-def register():
-    bpy.types.register(SimpleOperator)
-
-def unregister():
-    bpy.types.unregister(SimpleOperator)
 
 if __name__ == "__main__":
-    register()
+    bpy.ops.object.simple_operator()