Worker: check BLENDER_CMD environment variable (for multi-GPU Eevee rendering) #104193

Open
MKRelax wants to merge 9 commits from MKRelax/flamenco:worker-use-blender-from-env into main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Showing only changes of commit 46ab0075fb - Show all commits

View File

@ -115,6 +115,30 @@
<p v-else>Choose how a Worker should invoke the Blender command when performing a task:</p>
<fieldset v-if="autoFoundBlenders.length >= 1">
<label v-if="autoFoundBlenderEnvVariable" for="blender-env_variable">
<div>
<input
v-model="selectedBlender"
:value="autoFoundBlenderEnvVariable"
id="blender-env_variable"
name="blender"
type="radio" />
{{ sourceLabels[autoFoundBlenderEnvVariable.source] }}
</div>
<div class="setup-path-command">
<span class="path">
{{ autoFoundBlenderEnvVariable.path }}
</span>
<span
aria-label="Console output when running with --version"
class="command-preview"
data-microtip-position="top"
role="tooltip">
{{ autoFoundBlenderEnvVariable.cause }}
</span>
</div>
</label>
<label v-if="autoFoundBlenderPathEnvvar" for="blender-path_envvar">
<div>
<input
@ -236,6 +260,10 @@
>" as found on <code>$PATH</code> (currently "<code>{{ selectedBlender.path }}</code
>")
</dd>
<dd v-if="selectedBlender.source == 'env_variable'">
The command as found in <code>$FLAMENCO_BLENDER_PATH</code> (currently "<code>{{ selectedBlender.path }}</code
>")
</dd>
<dd v-if="selectedBlender.source == 'input_path'">
The command you provided: "<code>{{ selectedBlender.path }}</code
>"
@ -292,6 +320,7 @@ export default {
file_association: 'Blender that runs when you double-click a .blend file:',
path_envvar: 'Blender found on the $PATH environment:',
input_path: 'Another Blender executable:',
env_variable: 'Blender found in the $FLAMENCO_BLENDER_PATH environment variable:',
},
isConfirming: false,
isConfirmed: false,
@ -315,6 +344,9 @@ export default {
isConfigComplete() {
return this.isSharedStorageValid && this.isSelectedBlenderValid;
},
autoFoundBlenderEnvVariable() {
return this.autoFoundBlenders.find((b) => b.source === 'env_variable');
},
autoFoundBlenderPathEnvvar() {
return this.autoFoundBlenders.find((b) => b.source === 'path_envvar');
},