From 39b210db947a5a2de8a39656d24808e25d09f3c6 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 4 Mar 2019 19:37:46 +1100 Subject: Icons: only use macOS override if blender not found Otherwise `make icons_geom BLENDER_BIN=...` doesn't work as documented. --- release/datafiles/blender_icons_geom_update.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'release/datafiles/blender_icons_geom_update.py') 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"), -- cgit v1.2.3