[Bf-blender-cvs] [3b680c7] opensubdiv-modifier: Merge branch 'master' into opensubdiv-modifier

[Sergey Sharybin]

Commit: 3b680c798ce1c9c7e2f5e4afe9d019a45a31e91c
Author: Sergey Sharybin
Date:   Fri Jul 11 19:43:43 2014 +0600
https://developer.blender.org/rB3b680c798ce1c9c7e2f5e4afe9d019a45a31e91c

Merge branch 'master' into opensubdiv-modifier

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



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

diff --cc build_files/scons/tools/Blender.py
index 2d0a00d,c3ac92c..d5b6d94
mode 100644,100755..100755
--- a/build_files/scons/tools/Blender.py
+++ b/build_files/scons/tools/Blender.py