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

Merge branch 'fix/LD_LIBRARY_PATH_env' into 'master'

Browse Source 
add LD_LIBRARY_PATH to env

See merge request sheepitrenderfarm/client!220
This commit is contained in:
harlekin
2023-07-30 21:34:11 +00:00
parent 5450985586 f764ef0314
commit 97feb97bbe
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -47,6 +47,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Observable; import java.util.Observable;
import java.util.Observer; import java.util.Observer;
import java.util.Optional;
import java.util.TimeZone; import java.util.TimeZone;
import java.util.Timer; import java.util.Timer;
import java.util.TimerTask; import java.util.TimerTask;
@@ -230,6 +231,11 @@ import java.util.regex.Pattern;
new_env.put("BLENDER_SYSTEM_DATAFILES", ""); new_env.put("BLENDER_SYSTEM_DATAFILES", "");
new_env.put("OCIO", ""); //prevent blender from loading a non-standard color configuration new_env.put("OCIO", ""); //prevent blender from loading a non-standard color configuration
// Add own lib folder first, because Steam or other environments may set an LD_LIBRARY_PATH that has priority over the runpath in the Blender excutable,
// but contains incompatible libraries.
String currentLDLibraryPath = Optional.ofNullable(System.getenv("LD_LIBRARY_PATH")).orElse("");
new_env.put("LD_LIBRARY_PATH", getRendererDirectory() + "/lib" + ":" + currentLDLibraryPath);
for (String arg : command1) { for (String arg : command1) {
switch (arg) { switch (arg) {
case ".c": case ".c":