[Bf-blender-cvs] [797b1d5053] master: Fix T51024: Switch install_deps to set OSL_ROOT_DIR instead of CYCLES_OSL.

Bastien Montagne noreply at git.blender.org
Wed Mar 22 12:17:45 CET 2017


Commit: 797b1d505315351b48c3f231a476662482641024
Author: Bastien Montagne
Date:   Wed Mar 22 12:05:43 2017 +0100
Branches: master
https://developer.blender.org/rB797b1d505315351b48c3f231a476662482641024

Fix T51024: Switch install_deps to set OSL_ROOT_DIR instead of CYCLES_OSL.

Path by @alekulyn, thanks.

Differential Revision: https://developer.blender.org/D2571

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

M	build_files/build_environment/install_deps.sh

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

diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh
index ee49f83b38..ed1b9a3e62 100755
--- a/build_files/build_environment/install_deps.sh
+++ b/build_files/build_environment/install_deps.sh
@@ -4252,7 +4252,7 @@ print_info() {
     PRINT "  $_3"
     _buildargs="$_buildargs $_1 $_2 $_3"
     if [ -d $INST/osl ]; then
-      _1="-D CYCLES_OSL=$INST/osl"
+      _1="-D OSL_ROOT_DIR=$INST/osl"
       PRINT "  $_1"
       _buildargs="$_buildargs $_1"
     fi




More information about the Bf-blender-cvs mailing list