forked from bartvdbraak/blender
T53471: Fix crash with blender_icons_update.py
Default DPI of new inkscape caused incorrect image size.
This commit is contained in:
parent
be54868ec3
commit
cd845ae509
@ -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 "
|
||||
|
Loading…
Reference in New Issue
Block a user