Merge remote-tracking branch 'origin/release-20221201' into release-20221201

Author: jonoomph

src/windows/title_editor.py

@@ -29,6 +29,7 @@
 import os
 import re
 import shutil
+import sys
 import functools
 import subprocess
 import tempfile
@@ -88,6 +89,13 @@ def __init__(self, *args, edit_file_path=None, duplicate=False, **kwargs):
         # Track metrics
         track_metric_screen("title-screen")
 
+        # Get environment variables needed for launching a process without trying to load libraries
+        # from our frozen app bundle
+        self.env = dict(os.environ)
+        if sys.platform == "linux":
+            self.env.pop('LD_LIBRARY_PATH', None)
+            log.debug('Removing custom LD_LIBRARY_PATH from environment variables when launching Inkscape')
+
         # Initialize variables
         self.template_name = ""
         imp = minidom.getDOMImplementation()
@@ -624,7 +632,7 @@ def btnAdvanced_clicked(self):
         try:
             # launch advanced title editor
             log.info("Advanced title editor command: %s", str([prog, self.filename]))
-            p = subprocess.Popen([prog, self.filename])
+            p = subprocess.Popen([prog, self.filename], env=self.env)
             # wait for process to finish, then update preview
             p.communicate()
             self.load_svg_template(filename_field=filename_text)

src/windows/views/blender_listview.py

@@ -751,13 +751,13 @@ def __init__(self, blend_file_path, target_script, preview_frame=0):
         self.version = None
         self.process = None
         self.canceled = False
+
+        # Get environment variables needed for launching a process without trying to load libraries
+        # from our frozen app bundle
         self.env = dict(os.environ)
-        if sys.platform == "linux" and os.path.exists('/lib/x86_64-linux-gnu/'):
-            # If on Linux, verify we have the following LD library path defined.
-            # This is needed for Blender to use the system libraries instead
-            # of our AppImage libraries (i.e. our libtiff.so.5 is missing symbols,
-            # compared to libtiff.so.5 on newer distros for some reason).
-            self.env['LD_LIBRARY_PATH'] = '/lib/x86_64-linux-gnu/'
+        if sys.platform == "linux":
+            self.env.pop('LD_LIBRARY_PATH', None)
+            log.debug('Removing custom LD_LIBRARY_PATH from environment variables when launching Blender')
 
         self.startupinfo = None
         if sys.platform == 'win32':