diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-03-04 11:37:46 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-03-04 11:37:46 +0300 |
| commit | 39b210db947a5a2de8a39656d24808e25d09f3c6 (patch) | |
| tree | 8720d18c0f6574427b7976710296748a47993f8d /release/datafiles/blender_icons_geom_update.py | |
| parent | 798d2cadc307c8b53d111f86c66ace835dd4db49 (diff) | |
Icons: only use macOS override if blender not found
Otherwise `make icons_geom BLENDER_BIN=...` doesn't work as documented.
Diffstat (limited to 'release/datafiles/blender_icons_geom_update.py')
| -rwxr-xr-x | release/datafiles/blender_icons_geom_update.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/release/datafiles/blender_icons_geom_update.py b/release/datafiles/blender_icons_geom_update.py index c9c95f52899..52db26d72dc 100755 --- a/release/datafiles/blender_icons_geom_update.py +++ b/release/datafiles/blender_icons_geom_update.py @@ -40,10 +40,11 @@ blender_bin = os.environ.get("BLENDER_BIN", "blender") if not os.path.exists(blender_bin): blender_bin = os.path.join(ROOTDIR, "blender.bin") -if sys.platform == 'darwin': - blender_app_path = '/Applications/blender.app/Contents/MacOS/blender' - if os.path.exists(blender_app_path): - blender_bin = blender_app_path +if not os.path.exists(blender_bin): + if sys.platform == 'darwin': + blender_app_path = '/Applications/blender.app/Contents/MacOS/blender' + if os.path.exists(blender_app_path): + blender_bin = blender_app_path icons_blend = ( os.path.join(ROOTDIR, "..", "lib", "resources", "icon_geom.blend"), |