Raincloud/sheepit-shadow-nabber
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'ref/wording' into 'master'

Browse Source 
Fix: wording

See merge request sheepitrenderfarm/client!193
This commit is contained in:
Sheepit Renderfarm
2023-01-13 09:32:57 +00:00
parent af4c79e3de bef8fa8f32
commit 840d5172a1
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/sheepit/client/Error.java
View File

@@ -55,7 +55,7 @@ public class Error {
CURRENTLY_HEADLESS(28), CURRENTLY_HEADLESS(28),
DENOISING_NOT_SUPPORTED(29), DENOISING_NOT_SUPPORTED(29),
CANNOT_READ_FILE(30), CANNOT_READ_FILE(30),
SHEEPIT_DETECT_DEVICE_ERROR(31), DETECT_DEVICE_ERROR(31),
// internal error handling // internal error handling
NO_SPACE_LEFT_ON_DEVICE(100), NO_SPACE_LEFT_ON_DEVICE(100),
@@ -226,7 +226,7 @@ public class Error {
return "Blender can not open a display to create an OpenGL context needed for EEVEE/GPencil. Will try another project in a few minutes."; return "Blender can not open a display to create an OpenGL context needed for EEVEE/GPencil. Will try another project in a few minutes.";
case CANNOT_READ_FILE: case CANNOT_READ_FILE:
return "Blender failed to read the project files. Will try another project in a few minutes."; return "Blender failed to read the project files. Will try another project in a few minutes.";
case SHEEPIT_DETECT_DEVICE_ERROR: case DETECT_DEVICE_ERROR:
return "Blender failed to detect the render device. Please check if you have all the necessary libraries installed and if your drivers are up to date."; return "Blender failed to detect the render device. Please check if you have all the necessary libraries installed and if your drivers are up to date.";
default: default:
return in.toString(); return in.toString();

6
src/main/java/com/sheepit/client/Job.java
View File

@@ -993,13 +993,13 @@ import java.util.regex.Pattern;
//14-10 11:03:21 (debug) Blender quit //14-10 11:03:21 (debug) Blender quit
return Error.Type.CANNOT_READ_FILE; return Error.Type.CANNOT_READ_FILE;
} }
else if (line.contains("SHEEPIT_DETECT_DEVICE_ERROR")) { else if (line.contains("DETECT_DEVICE_ERROR")) {
//./blender-3.3.2-linux-x64/blender -b -E CYCLES -P /mnt/d/sheep_gpu/set_gpu.py -f 1 //./blender-3.3.2-linux-x64/blender -b -E CYCLES -P /mnt/d/sheep_gpu/set_gpu.py -f 1
//Blender 3.3.2 (hash bf24652e38a2 built 2022-12-07 01:12:36) //Blender 3.3.2 (hash bf24652e38a2 built 2022-12-07 01:12:36)
//Read prefs: /home/raimund/.config/blender/3.3/config/userpref.blend //Read prefs: /home/raimund/.config/blender/3.3/config/userpref.blend
///run/user/1000/gvfs/ non-existent directory ///run/user/1000/gvfs/ non-existent directory
//SHEEPIT_DETECT_DEVICE_ERRORR: Couldn't find OPTIX device with id CUDA_NVIDIA GeForce GTX 1080_0000:01:00_OptiX //DETECT_DEVICE_ERRORR: Couldn't find OPTIX device with id CUDA_NVIDIA GeForce GTX 1080_0000:01:00_OptiX
return Error.Type.SHEEPIT_DETECT_DEVICE_ERROR; return Error.Type.DETECT_DEVICE_ERROR;
} }
return Type.OK; return Type.OK;