tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

Fix: make icons command fails on macOS due to not finding inkscape 

The INKSCAPE_BIN environment variable set by GNUmakefile was overriding
a good default path, now bring it in line with other icons scripts.

Pull Request: https://projects.blender.org/blender/blender/pulls/117464
This commit is contained in:
Sean Kim 2024-01-24 18:52:40 +01:00 committed by Brecht Van Lommel
parent ae27daf834
commit 407dbdbcdc
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
release/datafiles/blender_icons_update.py
View File

@ -26,8 +26,8 @@ if sys.platform[:3] == "win":
env["SystemDrive"] = os.environ.get("SystemDrive", "")
env["SystemRoot"] = os.environ.get("SystemRoot", "")
inkscape_bin = "inkscape"
blender_bin = "blender"
inkscape_bin = os.environ.get("INKSCAPE_BIN", "inkscape")
blender_bin = os.environ.get("BLENDER_BIN", "blender")
if sys.platform == 'darwin':
inkscape_app_path = '/Applications/Inkscape.app/Contents/MacOS/inkscape'
@ -39,8 +39,6 @@ if sys.platform == 'darwin':
else:
blender_bin = "Blender"
inkscape_bin = os.environ.get("INKSCAPE_BIN", inkscape_bin)
blender_bin = os.environ.get("BLENDER_BIN", blender_bin)
cmd = (
inkscape_bin,