Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Sun, 23 Apr 2017 08:49:39 +0000 (10:49 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Sun, 23 Apr 2017 08:49:39 +0000 (10:49 +0200)
commitf93f4169cbfb2e3d5583d1bca5aa8466f37393dc
treeaa9a9b92e3e01608dcb1c2ed82d464e03ba5577b
parent79fd8eeb0e0dc10a9ca6825699d460c700d2aa3d
parent20c9c1b44e13e3b5bccc9b1d7e7cb512b5a3f465
Merge branch 'master' into blender2.8

Conflicts:
build_files/cmake/platform/platform_apple.cmake
build_files/cmake/platform/platform_apple.cmake