Sybren A. Stüvel aa4102a441 Merge branch 'master' into blender2.8 ...

Disabled a unittest, to be re-enabled when T51261 is fixed.

# Conflicts:
#	source/blender/alembic/intern/alembic_capi.cc

2017-04-20 12:50:20 +02:00

..

blender

Merge branch 'master' into blender2.8

2017-04-20 12:50:20 +02:00

blenderplayer

Merge remote-tracking branch 'origin/master' into blender2.8

2017-04-18 16:30:13 +02:00

creator

Depsgraph: Remove old depsgraph headers from creator

2017-04-06 15:40:08 +02:00

gameengine

Merge remote-tracking branch 'origin/master' into blender2.8

2017-04-18 16:30:13 +02:00

tools @ b11375e890

Fix blurry icons

2017-01-29 17:21:57 +03:00

CMakeLists.txt

Fix WITH_LEGACY_OPENGL=ON

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