Skip to content
Snippets Groups Projects
Commit 0ededdcd authored by Martin Poirier's avatar Martin Poirier
Browse files

netrender

Add rna callback to server address property so that it correctly checks if the server exists when the value changes.
parent 647f4a1e
No related branches found
No related tags found
No related merge requests found
...@@ -37,6 +37,7 @@ DONE = 2 ...@@ -37,6 +37,7 @@ DONE = 2
ERROR = 3 ERROR = 3
LAST_ADDRESS_TEST = 0 LAST_ADDRESS_TEST = 0
ADDRESS_TEST_TIMEOUT = 30
def base_poll(cls, context): def base_poll(cls, context):
rd = context.scene.render rd = context.scene.render
...@@ -67,11 +68,11 @@ def init_data(netsettings): ...@@ -67,11 +68,11 @@ def init_data(netsettings):
while(len(netsettings.jobs) > 0): while(len(netsettings.jobs) > 0):
netsettings.jobs.remove(0) netsettings.jobs.remove(0)
def verify_address(netsettings): def verify_address(netsettings, force=False):
global LAST_ADDRESS_TEST global LAST_ADDRESS_TEST
init_file() init_file()
if LAST_ADDRESS_TEST + 30 < time.time(): if force or LAST_ADDRESS_TEST + ADDRESS_TEST_TIMEOUT < time.time():
LAST_ADDRESS_TEST = time.time() LAST_ADDRESS_TEST = time.time()
try: try:
...@@ -384,11 +385,16 @@ class NetRenderSettings(bpy.types.PropertyGroup): ...@@ -384,11 +385,16 @@ class NetRenderSettings(bpy.types.PropertyGroup):
def register(NetRenderSettings): def register(NetRenderSettings):
from bpy.props import PointerProperty, StringProperty, BoolProperty, EnumProperty, IntProperty, CollectionProperty from bpy.props import PointerProperty, StringProperty, BoolProperty, EnumProperty, IntProperty, CollectionProperty
def address_update_callback(self, context):
netsettings = context.scene.network_render
verify_address(netsettings, True)
NetRenderSettings.server_address = StringProperty( NetRenderSettings.server_address = StringProperty(
name="Server address", name="Server address",
description="IP or name of the master render server", description="IP or name of the master render server",
maxlen = 128, maxlen = 128,
default = "[default]") default = "[default]",
update = address_update_callback)
NetRenderSettings.server_port = IntProperty( NetRenderSettings.server_port = IntProperty(
name="Server port", name="Server port",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment