Merge branch 'master' into blender2.8
authorStefan Werner <stefan.werner@tangent-animation.com>
Wed, 7 Nov 2018 19:44:40 +0000 (20:44 +0100)
committerStefan Werner <stefan.werner@tangent-animation.com>
Wed, 7 Nov 2018 19:44:40 +0000 (20:44 +0100)
1  2 
build_files/build_environment/install_deps.sh

index 08e18d840fb910f8c38b5d20fecc852168c98c71,62e5181e0396fa77b7d675ebc475cd6bdab90c28..6ce5fd9a8fbcb2206cc642ff8f4398b9d3941ad3
@@@ -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-jack,\
+ with-all,with-opencollada,with-jack,with-embree,\
  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,\