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

Stefan Werner noreply at git.blender.org
Wed Nov 7 20:44:57 CET 2018


Commit: 85a97449051a85538d1d8cb10c7efb83a50edf77
Author: Stefan Werner
Date:   Wed Nov 7 20:44:40 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB85a97449051a85538d1d8cb10c7efb83a50edf77

Merge branch 'master' into blender2.8

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



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

diff --cc build_files/build_environment/install_deps.sh
index 08e18d840fb,62e5181e039..6ce5fd9a8fb
--- 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-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,\



More information about the Bf-blender-cvs mailing list