diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-12-13 16:24:44 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-12-13 16:24:44 +0300 |
| commit | 3d6cc77cbd8fc1dbd92d186486d038857e6eda62 (patch) | |
| tree | 0a615d7dcce64a8ba19dd70a1448a37d4312865d /release | |
| parent | 32f85c8322e872951c7029fece0dc7d9102ed2b5 (diff) | |
| parent | 4838512e7d495cb74ac599a8cd4c788d006c843c (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'release')
| -rwxr-xr-x | release/datafiles/blender_icons_update.py | 13 |
1 files changed, 7 insertions, 6 deletions
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 " |