Tamito Kajiyama 3b61d2bb68 Merge branch 'master' into blender2.8 ...

Conflicts:
	intern/cycles/blender/addon/ui.py

2018-02-09 03:00:20 +09:00

..

blender

Merge branch 'master' into blender2.8

2018-02-09 03:00:20 +09:00

blenderplayer

Merge branch 'master' into blender2.8

2018-02-08 16:27:28 +01:00

creator

Merge branch 'master' into blender2.8

2018-02-02 14:15:29 +11:00

gameengine

Merge branch 'master' into blender2.8

2018-02-07 11:19:01 +11:00

tools @ b11375e890

Merge branch 'master' into blender2.8

2018-02-03 16:10:01 +01:00

CMakeLists.txt

Fix WITH_LEGACY_OPENGL=ON

2017-04-08 12:01:29 +10:00