[Bf-blender-cvs] [e6be5b8a2cd] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: e6be5b8a2cdbfb9e62ef6bed83da841846cdfd1e
Author: Campbell Barton
Date:   Tue Jun 27 09:57:40 2017 +1000
Branches: blender2.8
https://developer.blender.org/rBe6be5b8a2cdbfb9e62ef6bed83da841846cdfd1e

Merge branch 'master' into blender2.8

===================================================================



===================================================================

diff --cc build_files/build_environment/install_deps.sh
index cab67e68e0e,3852b4fe705..ad9ef3f8594
--- a/build_files/build_environment/install_deps.sh
+++ b/build_files/build_environment/install_deps.sh
@@@ -25,8 -25,8 +25,8 @@@
  ARGS=$( \
  getopt \
  -o s:i:t:h \
 ---long source:,install:,tmp:,info:,threads:,help,show-deps,no-sudo,no-build,no-confirm,use-cxx11,\
 +--long source:,install:,tmp:,info:,threads:,help,show-deps,no-sudo,no-build,no-confirm,\
- with-all,with-opencollada,\
+ with-all,with-opencollada,with-jack,\
  ver-ocio:,ver-oiio:,ver-llvm:,ver-osl:,ver-osd:,ver-openvdb:,\
  force-all,force-python,force-numpy,force-boost,\
  force-ocio,force-openexr,force-oiio,force-llvm,force-osl,force-osd,force-openvdb,\