Bastien Montagne 278d9c8322 Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blenderplayer/CMakeLists.txt
	tests/gtests/blenlib/CMakeLists.txt

2018-11-28 16:52:47 +01:00

..

alembic

…

blenlib

Merge branch 'master' into blender2.8

2018-11-28 16:52:47 +01:00

bmesh

…

guardedalloc

…

testing

…

CMakeLists.txt

…