[Bf-blender-cvs] [cd845ae5092] master: T53471: Fix crash with blender_icons_update.py

[Troy Sobotka]

Commit: cd845ae5092a76d7b830e2db3ff7f4ab6e58c50e
Author: Troy Sobotka
Date:   Wed Dec 13 16:54:45 2017 +1100
Branches: master
https://developer.blender.org/rBcd845ae5092a76d7b830e2db3ff7f4ab6e58c50e

T53471: Fix crash with blender_icons_update.py

Default DPI of new inkscape caused incorrect image size.

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

M	release/datafiles/blender_icons_update.py

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

diff --git a/release/datafiles/blender_icons_update.py b/release/datafiles/blender_icons_update.py
index ec753c567fa..d342df0a6f9 100755
--- a/release/datafiles/blender_icons_update.py
+++ b/release/datafiles/blender_icons_update.py
@@ -10,16 +10,17 @@ def run(cmd):
 
 BASEDIR = os.path.abspath(os.path.dirname(__file__)) + os.sep
 
-inkscape_path = 'inkscape'
+inkscape_bin = "inkscape"
+blender_bin = "blender"
 
 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
+        inkscape_bin = inkscape_app_path
 
-cmd = inkscape_path + ' "%sblender_icons.svg" --export-dpi=90  --without-gui --export-png="%sblender_icons16.png"' % (BASEDIR, BASEDIR)
+cmd = inkscape_bin + ' "%sblender_icons.svg" --export-width=602 --export-height=640 --without-gui --export-png="%sblender_icons16.png"' % (BASEDIR, BASEDIR)
 run(cmd)
-cmd = inkscape_path + ' "%sblender_icons.svg" --export-dpi=180 --without-gui --export-png="%sblender_icons32.png"' % (BASEDIR, BASEDIR)
+cmd = inkscape_bin + ' "%sblender_icons.svg" --export-width=1204 --export-height=1280 --without-gui --export-png="%sblender_icons32.png"' % (BASEDIR, BASEDIR)
 run(cmd)
 
 
@@ -31,7 +32,7 @@ datatoc_icon_split_py = os.path.join(BASEDIR, "..", "..", "source", "blender", "
 
 # create .dat pixmaps (which are stored in git)
 cmd = (
-    "blender "
+    blender_bin + " "
     "--background -noaudio "
     "--python " + datatoc_icon_split_py + " -- "
     "--image=" + BASEDIR + "blender_icons16.png "
@@ -46,7 +47,7 @@ cmd = (
 run(cmd)
 
 cmd = (
-    "blender "
+    blender_bin + " "
     "--background -noaudio "
     "--python " + datatoc_icon_split_py + " -- "
     "--image=" + BASEDIR + "blender_icons32.png "