[Bf-blender-cvs] [1d244db] depsgraph_refactor: Merge branch 'master' into depsgraph_refactor

[Sergey Sharybin]

Commit: 1d244db004ffced08758317db7d1fcc4ab511bc4
Author: Sergey Sharybin
Date:   Wed Dec 31 15:12:54 2014 +0500
Branches: depsgraph_refactor
https://developer.blender.org/rB1d244db004ffced08758317db7d1fcc4ab511bc4

Merge branch 'master' into depsgraph_refactor

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



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

diff --cc build_files/scons/tools/Blender.py
index d094666,eb2e57a..d094666
mode 100755,100644..100644
--- a/build_files/scons/tools/Blender.py
+++ b/build_files/scons/tools/Blender.py
diff --cc source/creator/CMakeLists.txt
index 0e965ad,21cb41d..0e965ad
mode 100755,100644..100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt