archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

netrender: fix poll methods

Browse Source
This commit is contained in:
Martin Poirier
2010-08-06 22:24:33 +00:00
parent dc3c979ac8
commit 9f0232766c
1 changed files with 12 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
release/scripts/io/netrender/ui.py
View File

@@ -36,6 +36,11 @@ DISPATCHED = 1
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 @@ class RENDER_PT_network_settings(bpy.types.Panel, RenderButtonsPanel):
@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 @@ class RENDER_PT_network_slave_settings(bpy.types.Panel, RenderButtonsPanel):
@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 @@ class RENDER_PT_network_master_settings(bpy.types.Panel, RenderButtonsPanel):
@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 @@ class RENDER_PT_network_job(bpy.types.Panel, RenderButtonsPanel):
@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 @@ class RENDER_PT_network_slaves(bpy.types.Panel, RenderButtonsPanel):
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 @@ class RENDER_PT_network_slaves_blacklist(bpy.types.Panel, RenderButtonsPanel):
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 @@ class RENDER_PT_network_jobs(bpy.types.Panel, RenderButtonsPanel):
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