NetRender:
- multires cache files and image .tex cache support in dependency list - Compare md5 of files before using a local copy (not one transfered by netrender). Could be changed to a simpler CRC if speed is an issue. The goal is not to have a strong crypto signature but just to detect outdated local files. - Reduce slave timeout to 5 minutes (down from 30). Slaves should report at most every 30s, there's no reason for a value to be that high. - Reorder the presentation tables on the main web page (job list is more important) - Collapse dependency list by default on job page (only show main file and headers for other files, point cache and fluid cache) - Slave option (default: True) to also output render log to the console (as well as the usual copy to the master)
This commit is contained in:
@@ -76,7 +76,7 @@ def verify_address(netsettings):
|
||||
else:
|
||||
netsettings.server_address = "[default]"
|
||||
|
||||
class RenderButtonsPanel(bpy.types.Panel):
|
||||
class RenderButtonsPanel():
|
||||
bl_space_type = "PROPERTIES"
|
||||
bl_region_type = "WINDOW"
|
||||
bl_context = "render"
|
||||
@@ -88,7 +88,7 @@ class RenderButtonsPanel(bpy.types.Panel):
|
||||
|
||||
# Setting panel, use in the scene for now.
|
||||
@rnaType
|
||||
class RENDER_PT_network_settings(RenderButtonsPanel):
|
||||
class RENDER_PT_network_settings(bpy.types.Panel, RenderButtonsPanel):
|
||||
bl_label = "Network Settings"
|
||||
COMPAT_ENGINES = {'NET_RENDER'}
|
||||
|
||||
@@ -123,7 +123,7 @@ class RENDER_PT_network_settings(RenderButtonsPanel):
|
||||
layout.operator("render.netclientweb", icon='QUESTION')
|
||||
|
||||
@rnaType
|
||||
class RENDER_PT_network_slave_settings(RenderButtonsPanel):
|
||||
class RENDER_PT_network_slave_settings(bpy.types.Panel, RenderButtonsPanel):
|
||||
bl_label = "Slave Settings"
|
||||
COMPAT_ENGINES = {'NET_RENDER'}
|
||||
|
||||
@@ -141,13 +141,14 @@ class RENDER_PT_network_slave_settings(RenderButtonsPanel):
|
||||
|
||||
layout.prop(netsettings, "slave_clear")
|
||||
layout.prop(netsettings, "slave_thumb")
|
||||
layout.prop(netsettings, "slave_outputlog")
|
||||
layout.label(text="Threads:")
|
||||
layout.prop(rd, "threads_mode", expand=True)
|
||||
sub = layout.column()
|
||||
sub.enabled = rd.threads_mode == 'FIXED'
|
||||
sub.prop(rd, "threads")
|
||||
@rnaType
|
||||
class RENDER_PT_network_master_settings(RenderButtonsPanel):
|
||||
class RENDER_PT_network_master_settings(bpy.types.Panel, RenderButtonsPanel):
|
||||
bl_label = "Master Settings"
|
||||
COMPAT_ENGINES = {'NET_RENDER'}
|
||||
|
||||
@@ -166,7 +167,7 @@ class RENDER_PT_network_master_settings(RenderButtonsPanel):
|
||||
layout.prop(netsettings, "master_clear")
|
||||
|
||||
@rnaType
|
||||
class RENDER_PT_network_job(RenderButtonsPanel):
|
||||
class RENDER_PT_network_job(bpy.types.Panel, RenderButtonsPanel):
|
||||
bl_label = "Job Settings"
|
||||
COMPAT_ENGINES = {'NET_RENDER'}
|
||||
|
||||
@@ -206,7 +207,7 @@ class RENDER_PT_network_job(RenderButtonsPanel):
|
||||
row.prop(netsettings, "chunks")
|
||||
|
||||
@rnaType
|
||||
class RENDER_PT_network_slaves(RenderButtonsPanel):
|
||||
class RENDER_PT_network_slaves(bpy.types.Panel, RenderButtonsPanel):
|
||||
bl_label = "Slaves Status"
|
||||
COMPAT_ENGINES = {'NET_RENDER'}
|
||||
|
||||
@@ -245,7 +246,7 @@ class RENDER_PT_network_slaves(RenderButtonsPanel):
|
||||
layout.label(text="Stats: " + slave.stats)
|
||||
|
||||
@rnaType
|
||||
class RENDER_PT_network_slaves_blacklist(RenderButtonsPanel):
|
||||
class RENDER_PT_network_slaves_blacklist(bpy.types.Panel, RenderButtonsPanel):
|
||||
bl_label = "Slaves Blacklist"
|
||||
COMPAT_ENGINES = {'NET_RENDER'}
|
||||
|
||||
@@ -283,7 +284,7 @@ class RENDER_PT_network_slaves_blacklist(RenderButtonsPanel):
|
||||
layout.label(text="Stats: " + slave.stats)
|
||||
|
||||
@rnaType
|
||||
class RENDER_PT_network_jobs(RenderButtonsPanel):
|
||||
class RENDER_PT_network_jobs(bpy.types.Panel, RenderButtonsPanel):
|
||||
bl_label = "Jobs"
|
||||
COMPAT_ENGINES = {'NET_RENDER'}
|
||||
|
||||
@@ -365,6 +366,11 @@ NetRenderSettings.BoolProperty( attr="slave_thumb",
|
||||
description="Generate thumbnails on slaves instead of master",
|
||||
default = False)
|
||||
|
||||
NetRenderSettings.BoolProperty( attr="slave_outputlog",
|
||||
name="Output render log on console",
|
||||
description="Output render text log to console as well as sending it to the master",
|
||||
default = True)
|
||||
|
||||
NetRenderSettings.BoolProperty( attr="master_clear",
|
||||
name="Clear on exit",
|
||||
description="delete saved files on exit",
|
||||
|
||||
Reference in New Issue
Block a user