[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31126] trunk/blender/release/scripts/io/ netrender/ui.py: netrender: fix poll methods

[Martin Poirier]

Revision: 31126
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31126
Author:   theeth
Date:     2010-08-07 00:24:33 +0200 (Sat, 07 Aug 2010)

Log Message:
-----------
netrender: fix poll methods

Modified Paths:
--------------
    trunk/blender/release/scripts/io/netrender/ui.py

Modified: trunk/blender/release/scripts/io/netrender/ui.py
===================================================================
--- trunk/blender/release/scripts/io/netrender/ui.py	2010-08-06 21:21:01 UTC (rev 31125)
+++ trunk/blender/release/scripts/io/netrender/ui.py	2010-08-06 22:24:33 UTC (rev 31126)
@@ -36,6 +36,11 @@
 DONE = 2
 ERROR = 3
 
+def base_poll(cls, context):
+    rd = context.scene.render
+    return (rd.use_game_engine==False) and (rd.engine in cls.COMPAT_ENGINES)
+    
+
 def init_file():
     if netrender.init_file != bpy.data.filepath:
         netrender.init_file = bpy.data.filepath
@@ -90,8 +95,7 @@
 
     @staticmethod
     def poll(context):
-        rd = context.scene.render
-        return (rd.use_game_engine==False) and (rd.engine in __class__.COMPAT_ENGINES)
+        return base_poll(__class__, context)
 
     def draw(self, context):
         layout = self.layout
@@ -130,10 +134,7 @@
     @staticmethod
     def poll(context):
         scene = context.scene
-        ### return (super().poll(context)
-        ###         and scene.network_render.mode == "RENDER_SLAVE")
-        ### FIXME ^^^
-        return scene.network_render.mode == "RENDER_SLAVE"
+        return base_poll(__class__, context) and scene.network_render.mode == "RENDER_SLAVE"
 
     def draw(self, context):
         layout = self.layout
@@ -158,10 +159,7 @@
     @staticmethod
     def poll(context):
         scene = context.scene
-        ### return (super().poll(context)
-        ###         and scene.network_render.mode == "RENDER_MASTER")
-        ### ^^^ FIXME
-        return scene.network_render.mode == "RENDER_MASTER"
+        return base_poll(__class__, context) and scene.network_render.mode == "RENDER_MASTER"
 
     def draw(self, context):
         layout = self.layout
@@ -179,10 +177,7 @@
     @staticmethod
     def poll(context):
         scene = context.scene
-        ### return (super().poll(context)
-        ###         and scene.network_render.mode == "RENDER_CLIENT")
-        ### ^^^ FIXME
-        return scene.network_render.mode == "RENDER_CLIENT"
+        return base_poll(__class__, context) and scene.network_render.mode == "RENDER_CLIENT"
 
     def draw(self, context):
         layout = self.layout
@@ -226,10 +221,7 @@
         if netsettings.mode != "RENDER_CLIENT":
             return False
         verify_address(netsettings)
-        ### return (super().poll(context)
-        ###         and netsettings.server_address != "[default]")
-        ### ^^^ FIXME
-        return netsettings.server_address != "[default]"
+        return base_poll(__class__, context) and netsettings.server_address != "[default]"
 
     def draw(self, context):
         layout = self.layout
@@ -267,9 +259,7 @@
         if netsettings.mode != "RENDER_CLIENT":
             return False
         verify_address(netsettings)
-        ### return (super().poll(context)
-        ###        and netsettings.server_address != "[default]")
-        return netsettings.server_address != "[default]"
+        return base_poll(__class__, context) and netsettings.server_address != "[default]"
 
     def draw(self, context):
         layout = self.layout
@@ -306,10 +296,7 @@
         if netsettings.mode != "RENDER_CLIENT":
             return False
         verify_address(netsettings)
-        ### return (super().poll(context)
-        ###        and netsettings.server_address != "[default]")
-        ### ^^^ FIXME
-        return netsettings.server_address != "[default]"
+        return base_poll(__class__, context) and netsettings.server_address != "[default]"
 
     def draw(self, context):
         layout = self.layout