Commit: 39b210db947a5a2de8a39656d24808e25d09f3c6
Author: Campbell Barton
Date: Mon Mar 4 19:37:46 2019 +1100
Branches: master
https://developer.blender.org/rB39b210db947a5a2de8a39656d24808e25d09f3c6
Icons: only use macOS override if blender not found
Otherwise `make icons_geom BLENDER_BIN=...` doesn't work as documented.
===================================================================
M 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"),
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
