web/app/src/views/SetupAssistantView.vue

@@ -101,9 +101,7 @@
         v-show="currentSetupStep == 3"
         @next-clicked="nextStepAfterCheckBlenderExePath"
         @back-clicked="prevStep"
-        :is-next-clickable="
+        :is-next-clickable="selectedBlender != null || customBlenderExe != ''"
-          selectedBlender != null || customBlenderExe != '' || skipCustomBlenderExe
-        "
         title="Blender">
         <div v-if="isBlenderExeFinding" class="is-in-progress">Looking for Blender installs...</div>
 
@@ -196,15 +194,15 @@
         </fieldset>
 
         <fieldset v-if="autoFoundBlenders.length === 0">
-          <label for="custom_blender-input_path">
+          <label for="blender-input_path">
             <div>
               <input
-                v-model="skipCustomBlenderExe"
-                value="false"
                 type="radio"
+                v-model="selectedBlender"
                 name="blender"
-                id="custom_blender-input_path" />
+                :value="blenderFromInputPath"
-              I have a Blender path:
+                id="blender-input_path" />
+              {{ sourceLabels['input_path'] }}
             </div>
             <div>
               <input
@@ -225,15 +223,15 @@
             </div>
           </label>
 
-          <label for="skip_blender-input_path">
+          <label for="blender-default">
             <div>
               <input
-                v-model="skipCustomBlenderExe"
-                value="true"
                 type="radio"
+                v-model="selectedBlender"
                 name="blender"
-                id="skip_blender-input_path" />
+                :value="blenderFromDefaultSource"
-              Skip, let the Workers use whatever Blender is available.
+                id="blender-default" />
+              {{ sourceLabels['default'] }}
             </div>
           </label>
         </fieldset>
@@ -263,11 +261,11 @@
               >" as found on <code>$PATH</code> (currently "<code>{{ selectedBlender.path }}</code
               >")
             </dd>
-            <dd v-if="selectedBlender.source == 'input_path' && !skipCustomBlenderExe">
+            <dd v-if="selectedBlender.source == 'input_path'">
               The command you provided: "<code>{{ selectedBlender.path }}</code
               >"
             </dd>
-            <dd v-if="selectedBlender.source == 'input_path' && skipCustomBlenderExe">
+            <dd v-if="selectedBlender.source == 'default'">
               You have choosen to skip adding a blender path.
             </dd>
           </dl>
@@ -316,13 +314,13 @@ export default {
     selectedBlender: null, // the chosen api.BlenderPathCheckResult
 
     customBlenderExe: '',
-    skipCustomBlenderExe: false,
     isBlenderExeChecking: false,
     blenderExeCheckResult: null, // api.BlenderPathCheckResult
     sourceLabels: {
       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:',
+      input_path: 'Specify a Blender executable:',
+      default: 'Skip, let the Workers use whatever Blender is available.',
     },
     isConfirming: false,
     isConfirmed: false,
@@ -355,6 +353,15 @@ export default {
     blenderFromInputPath() {
       return this.allBlenders.find((b) => b.source === 'input_path');
     },
+    blenderFromDefaultSource() {
+      return {
+        input: 'blender',
+        path: 'blender',
+        source: 'default',
+        is_usable: true,
+        cause: 'blender',
+      };
+    },
     setupConfirmIsClickable() {
       if (this.isConfirming || this.isConfirmed) {
         return false;
@@ -418,17 +425,6 @@ 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.