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

[mano-wii]

Commit: c2b2f9baa88e6bec9323ee8f2d9d8fc1861aeef5
Author: mano-wii
Date:   Fri Mar 22 16:23:23 2019 -0300
Branches: master
https://developer.blender.org/rBc2b2f9baa88e6bec9323ee8f2d9d8fc1861aeef5

Merge branch 'blender2.7'

 Conflicts:
	CMakeLists.txt

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



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