[Bf-blender-cvs] [a9c29716587] master: Merge branch 'blender2.7'

[Bastien Montagne]

Commit: a9c297165878b3c427a20f787cc90a6ada4df253
Author: Bastien Montagne
Date:   Mon Jan 28 22:27:45 2019 +0100
Branches: master
https://developer.blender.org/rBa9c297165878b3c427a20f787cc90a6ada4df253

Merge branch 'blender2.7'

Conflicts:
	source/creator/CMakeLists.txt

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



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