archive/blender-cloud-addon
Archived
1
3
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Added support for blender-render-progressive jobs

Browse Source
This commit is contained in:
Sybren A. Stüvel 2017-01-30 10:38:35 +01:00
parent cb73030e6a
commit 23549fa676
1 changed files with 37 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
blender_cloud/flamenco/__init__.py
View File

@ -165,11 +165,17 @@ class FLAMENCO_OT_render(async_loop.AsyncModalOperatorMixin,
context.window_manager.flamenco_status = 'COMMUNICATING' context.window_manager.flamenco_status = 'COMMUNICATING'
settings = {'blender_cmd': '{blender}', settings = {'blender_cmd': '{blender}',
'chunk_size': scene.flamenco_render_chunk_size, 'chunk_size': scene.flamenco_render_fchunk_size,
'filepath': str(outfile), 'filepath': str(outfile),
'frames': scene.flamenco_render_frame_range, 'frames': scene.flamenco_render_frame_range,
'render_output': str(render_output), 'render_output': str(render_output),
} }
# Add extra settings specific to the job type
if scene.flamenco_render_job_type == 'blender-render-progressive':
settings['cycles_num_chunks'] = scene.flamenco_render_schunk_count
settings['cycles_sample_count'] = scene.cycles.samples
try: try:
job_info = await create_job(self.user_id, job_info = await create_job(self.user_id,
prefs.attract_project.project, prefs.attract_project.project,
@ -412,7 +418,7 @@ def _render_output_path(
return dir_components / flamenco_render_frame_range return dir_components / flamenco_render_frame_range
def render_output_path(context, filepath: Path=None) -> typing.Optional[PurePath]: def render_output_path(context, filepath: Path = None) -> typing.Optional[PurePath]:
"""Returns the render output path to be sent to Flamenco. """Returns the render output path to be sent to Flamenco.
:param context: the Blender context (used to find Flamenco preferences etc.) :param context: the Blender context (used to find Flamenco preferences etc.)
@ -453,9 +459,6 @@ class FLAMENCO_PT_render(bpy.types.Panel):
prefs = preferences() prefs = preferences()
layout.prop(context.scene, 'flamenco_render_job_priority')
layout.prop(context.scene, 'flamenco_render_chunk_size')
labeled_row = layout.split(0.25, align=True) labeled_row = layout.split(0.25, align=True)
labeled_row.label('Job Type:') labeled_row.label('Job Type:')
labeled_row.prop(context.scene, 'flamenco_render_job_type', text='') labeled_row.prop(context.scene, 'flamenco_render_job_type', text='')
@ -466,6 +469,12 @@ class FLAMENCO_PT_render(bpy.types.Panel):
prop_btn_row.prop(context.scene, 'flamenco_render_frame_range', text='') prop_btn_row.prop(context.scene, 'flamenco_render_frame_range', text='')
prop_btn_row.operator('flamenco.scene_to_frame_range', text='', icon='ARROW_LEFTRIGHT') prop_btn_row.operator('flamenco.scene_to_frame_range', text='', icon='ARROW_LEFTRIGHT')
layout.prop(context.scene, 'flamenco_render_job_priority')
layout.prop(context.scene, 'flamenco_render_fchunk_size')
if getattr(context.scene, 'flamenco_render_job_type', None) == 'blender-render-progressive':
layout.prop(context.scene, 'flamenco_render_schunk_count')
readonly_stuff = layout.column(align=True) readonly_stuff = layout.column(align=True)
labeled_row = readonly_stuff.split(0.25, align=True) labeled_row = readonly_stuff.split(0.25, align=True)
labeled_row.label('Storage:') labeled_row.label('Storage:')
@ -518,24 +527,34 @@ def register():
bpy.utils.register_class(FLAMENCO_PT_render) bpy.utils.register_class(FLAMENCO_PT_render)
scene = bpy.types.Scene scene = bpy.types.Scene
scene.flamenco_render_chunk_size = IntProperty( scene.flamenco_render_fchunk_size = IntProperty(
name='Chunk size', name='Frame Chunk Size',
description='Maximum number of frames to render per task', description='Maximum number of frames to render per task',
min=1,
default=10, default=10,
) )
scene.flamenco_render_schunk_count = IntProperty(
name='Number of Sample Chunks',
description='Number of Cycles samples chunks to use per frame',
min=2,
default=3,
soft_max=10,
)
scene.flamenco_render_frame_range = StringProperty( scene.flamenco_render_frame_range = StringProperty(
name='Frame range', name='Frame Range',
description='Frames to render, in "printer range" notation' description='Frames to render, in "printer range" notation'
) )
scene.flamenco_render_job_type = EnumProperty( scene.flamenco_render_job_type = EnumProperty(
name='Job type', name='Job Type',
items=[ items=[
('blender-render', 'Simple Blender render', 'Not tiled, not resumable, just render'), ('blender-render', 'Simple Render', 'Simple frame-by-frame render'),
], ('blender-render-progressive', 'Progressive Render',
description='Flamenco render job type', 'Each frame is rendered multiple times with different Cycles sample chunks, then combined'),
]
) )
scene.flamenco_render_job_priority = IntProperty( scene.flamenco_render_job_priority = IntProperty(
name='Job priority', name='Job Priority',
min=0, min=0,
default=50, default=50,
max=100, max=100,
@ -558,7 +577,11 @@ def unregister():
bpy.utils.unregister_module(__name__) bpy.utils.unregister_module(__name__)
try: try:
del bpy.types.Scene.flamenco_render_chunk_size del bpy.types.Scene.flamenco_render_fchunk_size
except AttributeError:
pass
try:
del bpy.types.Scene.flamenco_render_schunk_count
except AttributeError: except AttributeError:
pass pass
try: try: