[Bf-blender-cvs] [127b92d] master: InstallDeps: Fix wrong OPENCOLLADA settings in final messages in some cases.

[Bastien Montagne]

Commit: 127b92de838c0f27c27aad3237032d82d7fbd501
Author: Bastien Montagne
Date:   Thu Oct 9 13:32:20 2014 +0200
Branches: master
https://developer.blender.org/rB127b92de838c0f27c27aad3237032d82d7fbd501

InstallDeps: Fix wrong OPENCOLLADA settings in final messages in some cases.

Reported by Jefferson Rausseo through mail, thanks.

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

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 903fdc3..4ed0399 100755
--- a/build_files/build_environment/install_deps.sh
+++ b/build_files/build_environment/install_deps.sh
@@ -471,11 +471,12 @@ while true; do
   esac
 done
 
-if $WITH_ALL; then
+if [ $WITH_ALL == true -a $OPENCOLLADA_SKIP == false ]; then
   WITH_OPENCOLLADA=true
 fi
 
 
+
 # This has to be done here, because user might force some versions...
 PYTHON_SOURCE=( "http://python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tgz" )
 NUMPY_SOURCE=( "http://sourceforge.net/projects/numpy/files/NumPy/$NUMPY_VERSION/numpy-$NUMPY_VERSION.tar.gz" )