Bastien Montagne e9bb018a4a Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/alembic/intern/abc_exporter.h

2017-04-05 10:02:25 +02:00

..

blender

Merge branch 'master' into blender2.8

2017-04-05 10:02:25 +02:00

blenderplayer

Fix blenderplayer compilation

2017-04-04 21:52:28 +02:00

creator

OpenGL: remove non-GLSL option from basic shader

2017-03-15 11:53:48 -04:00

gameengine

GPULamp: Separate GPULamp from GPUMaterial

2017-04-03 21:52:03 +02:00

tools @ b11375e890

Fix blurry icons

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

CMakeLists.txt

Move tests into tests/ top-level dir

2014-06-18 22:03:46 +10:00