studio/flamenco
studio/flamenco
12
30
Fork 38
Code Issues 63 Pull Requests 5 Releases Wiki Activity

WIP: Single-frame job compiler #104194

Draft
k8ie wants to merge 30 commits from k8ie/flamenco:single-frame into main
pull from: k8ie/flamenco:single-frame
merge into: studio:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 22 Commits 30 Files Changed 1 +6 -6
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0be9ea87b1 - Show all commits

12
internal/manager/job_compilers/scripts/single_frame_blender_render.js
View File

@ -22,8 +22,8 @@ const JOB_TYPE = {
// Automatically evaluated settings: // Automatically evaluated settings:
{ key: "blendfile", type: "string", required: true, description: "Path of the Blend file to render", visible: "web" }, { key: "blendfile", type: "string", required: true, description: "Path of the Blend file to render", visible: "web" },
{ key: "format", type: "string", required: true, eval: "C.scene.render.image_settings.file_format", visible: "web" }, { key: "format", type: "string", required: true, eval: "C.scene.render.image_settings.file_format", visible: "web" },
{ key: "compositing", type: "bool", required: true, eval: "C.scene.use_nodes and C.scene.render.use_compositing", visible: "web" }, { key: "use_compositing", type: "bool", required: true, eval: "C.scene.use_nodes and C.scene.render.use_compositing", visible: "web" },
{ key: "denoising", type: "bool", required: true, eval: "C.scene.cycles.use_denoising", visible: "web", { key: "use_denoising", type: "bool", required: true, eval: "C.scene.cycles.use_denoising", visible: "web",
description: "Toggles OpenImageDenoise" }, description: "Toggles OpenImageDenoise" },
{ key: "image_file_extension", type: "string", required: true, eval: "C.scene.render.file_extension", visible: "hidden", { key: "image_file_extension", type: "string", required: true, eval: "C.scene.render.file_extension", visible: "hidden",
description: "File extension used for the final export" }, description: "File extension used for the final export" },
@ -112,7 +112,7 @@ bpy.context.scene.cycles.use_denoising = False
bpy.context.scene.render.image_settings.file_format = 'OPEN_EXR_MULTILAYER' bpy.context.scene.render.image_settings.file_format = 'OPEN_EXR_MULTILAYER'
bpy.context.scene.cycles.samples = ${chunk_size} bpy.context.scene.cycles.samples = ${chunk_size}
bpy.context.scene.cycles.sample_offset = ${chunk_start}`; bpy.context.scene.cycles.sample_offset = ${chunk_start}`;
if (settings.denoising) { if (settings.use_denoising) {
pythonExpression += ` pythonExpression += `
for layer in bpy.context.scene.view_layers: for layer in bpy.context.scene.view_layers:
layer['cycles']['denoising_store_passes'] = 1 layer['cycles']['denoising_store_passes'] = 1
@ -187,7 +187,7 @@ pathlib.Path(tmp + str(index-1)+'.exr').rename(basepath + 'MERGED.exr')`;
} }
function authorCreateDenoiseTask(settings, renderOutput) { function authorCreateDenoiseTask(settings, renderOutput) {
if (! settings.denoising) { if (! settings.use_denoising) {
return; return;
} }
const task = author.Task(`denoise`, "blender"); const task = author.Task(`denoise`, "blender");
@ -211,7 +211,7 @@ bpy.ops.cycles.denoise_animation(input_filepath="${renderOutput}/MERGED.exr", ou
function authorCreateCompositeTask(settings, renderOutput) { function authorCreateCompositeTask(settings, renderOutput) {
let filename; let filename;
if (settings.denoising) { if (settings.use_denoising) {
filename = "DENOISED.exr"; filename = "DENOISED.exr";
} }
else { else {
@ -223,7 +223,7 @@ import bpy
C = bpy.context C = bpy.context
basepath = "${renderOutput}/" basepath = "${renderOutput}/"
filename = "${filename}"`; filename = "${filename}"`;
if (settings.compositing) { if (settings.use_compositing) {
// Do the full composite+export pipeline // Do the full composite+export pipeline
// uses snippets from // uses snippets from
// https://github.com/state-of-the-art/BlendNet/blob/master/BlendNet/script-compose.py#L94 // https://github.com/state-of-the-art/BlendNet/blob/master/BlendNet/script-compose.py#L94