From ac74718e6f525429165664bcf30be5ff8db59581 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Fri, 17 Jan 2014 16:50:11 +0100 Subject: [PATCH] Icons: make inkscape svg to png conversion work with Inkscape.app on OS X. --- release/datafiles/blender_icons_update.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/release/datafiles/blender_icons_update.py b/release/datafiles/blender_icons_update.py index b4b772b6a85..ec753c567fa 100755 --- a/release/datafiles/blender_icons_update.py +++ b/release/datafiles/blender_icons_update.py @@ -2,6 +2,7 @@ # This script updates icons from the SVG file import os +import sys def run(cmd): print(" ", cmd) @@ -9,9 +10,16 @@ def run(cmd): BASEDIR = os.path.abspath(os.path.dirname(__file__)) + os.sep -cmd = 'inkscape "%sblender_icons.svg" --export-dpi=90 --without-gui --export-png="%sblender_icons16.png"' % (BASEDIR, BASEDIR) +inkscape_path = 'inkscape' + +if sys.platform == 'darwin': + inkscape_app_path = '/Applications/Inkscape.app/Contents/Resources/script' + if os.path.exists(inkscape_app_path): + inkscape_path = inkscape_app_path + +cmd = inkscape_path + ' "%sblender_icons.svg" --export-dpi=90 --without-gui --export-png="%sblender_icons16.png"' % (BASEDIR, BASEDIR) run(cmd) -cmd = 'inkscape "%sblender_icons.svg" --export-dpi=180 --without-gui --export-png="%sblender_icons32.png"' % (BASEDIR, BASEDIR) +cmd = inkscape_path + ' "%sblender_icons.svg" --export-dpi=180 --without-gui --export-png="%sblender_icons32.png"' % (BASEDIR, BASEDIR) run(cmd)