[Bf-blender-cvs] [ac74718] master: Icons: make inkscape svg to png conversion work with Inkscape.app on OS X.

Brecht Van Lommel noreply at git.blender.org
Fri Jan 17 16:51:21 CET 2014


Commit: ac74718e6f525429165664bcf30be5ff8db59581
Author: Brecht Van Lommel
Date:   Fri Jan 17 16:50:11 2014 +0100
https://developer.blender.org/rBac74718e6f525429165664bcf30be5ff8db59581

Icons: make inkscape svg to png conversion work with Inkscape.app on OS X.

===================================================================

M	release/datafiles/blender_icons_update.py

===================================================================

diff --git a/release/datafiles/blender_icons_update.py b/release/datafiles/blender_icons_update.py
index b4b772b..ec753c5 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)




More information about the Bf-blender-cvs mailing list