Manager: allow setup to finish without Blender #104306
@ -101,7 +101,9 @@
|
||||
v-show="currentSetupStep == 3"
|
||||
@next-clicked="nextStepAfterCheckBlenderExePath"
|
||||
@back-clicked="prevStep"
|
||||
:is-next-clickable="selectedBlender != null || customBlenderExe != (null || '')"
|
||||
:is-next-clickable="
|
||||
selectedBlender != null || customBlenderExe != (null || '') || skipCustomBlenderExe
|
||||
"
|
||||
title="Blender">
|
||||
<div v-if="isBlenderExeFinding" class="is-in-progress">Looking for Blender installs...</div>
|
||||
|
||||
@ -193,7 +195,18 @@
|
||||
</label>
|
||||
</fieldset>
|
||||
|
||||
<div v-if="autoFoundBlenders.length === 0">
|
||||
<fieldset v-if="autoFoundBlenders.length === 0">
|
||||
<label for="custom_blender-input_path">
|
||||
<div>
|
||||
<input
|
||||
v-model="skipCustomBlenderExe"
|
||||
value="false"
|
||||
type="radio"
|
||||
name="blender"
|
||||
id="custom_blender-input_path" />
|
||||
I have a Blender path:
|
||||
</div>
|
||||
<div>
|
||||
<input
|
||||
v-model="customBlenderExe"
|
||||
@keyup.enter="nextStepAfterCheckBlenderExePath"
|
||||
@ -210,6 +223,20 @@
|
||||
{{ blenderExeCheckResult.cause }}
|
||||
</p>
|
||||
</div>
|
||||
</label>
|
||||
|
||||
<label for="skip_blender-input_path">
|
||||
<div>
|
||||
<input
|
||||
v-model="skipCustomBlenderExe"
|
||||
value="true"
|
||||
type="radio"
|
||||
name="blender"
|
||||
id="skip_blender-input_path" />
|
||||
Skip, let the Workers use whatever Blender is available.
|
||||
</div>
|
||||
</label>
|
||||
</fieldset>
|
||||
</step-item>
|
||||
|
||||
<step-item
|
||||
@ -236,10 +263,13 @@
|
||||
>" as found on <code>$PATH</code> (currently "<code>{{ selectedBlender.path }}</code
|
||||
>")
|
||||
</dd>
|
||||
<dd v-if="selectedBlender.source == 'input_path'">
|
||||
<dd v-if="selectedBlender.source == 'input_path' && !skipCustomBlenderExe">
|
||||
The command you provided: "<code>{{ selectedBlender.path }}</code
|
||||
>"
|
||||
</dd>
|
||||
<dd v-if="selectedBlender.source == 'input_path' && skipCustomBlenderExe">
|
||||
You have choosen to skip adding a blender path.
|
||||
</dd>
|
||||
</dl>
|
||||
</div>
|
||||
<p v-if="isConfirmed" class="check-ok">
|
||||
@ -286,6 +316,7 @@ export default {
|
||||
selectedBlender: null, // the chosen api.BlenderPathCheckResult
|
||||
|
||||
customBlenderExe: '',
|
||||
skipCustomBlenderExe: false,
|
||||
isBlenderExeChecking: false,
|
||||
blenderExeCheckResult: null, // api.BlenderPathCheckResult
|
||||
sourceLabels: {
|
||||
@ -387,6 +418,17 @@ export default {
|
||||
},
|
||||
|
||||
checkBlenderExePath() {
|
||||
if (this.skipCustomBlenderExe) {
|
||||
this.selectedBlender = {
|
||||
input: 'blender',
|
||||
path: 'blender',
|
||||
source: 'input_path',
|
||||
is_usable: true,
|
||||
cause: 'blender',
|
||||
};
|
||||
return;
|
||||
}
|
||||
|
||||
const exeToTry = this.cleanCustomBlenderExe;
|
||||
if (exeToTry == '') {
|
||||
// Just erase any previously-found custom Blender executable.
|
||||
|
Loading…
Reference in New Issue
Block a user