Merge branch 'master' into blender2.8

This commit is contained in:
Campbell Barton
2018-08-21 20:28:28 +10:00

View File

@@ -92,7 +92,7 @@ endif
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# Blender binary path # Blender binary path
ifeq ($(OS), darwin) ifeq ($(OS), Darwin)
BLENDER_BIN="$(BUILD_DIR)/bin/blender.app/Contents/MacOS/blender" BLENDER_BIN="$(BUILD_DIR)/bin/blender.app/Contents/MacOS/blender"
else else
BLENDER_BIN="$(BUILD_DIR)/bin/blender" BLENDER_BIN="$(BUILD_DIR)/bin/blender"