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

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

2016-11-07 15:46:27 +01:00

..

blender

Merge branch 'master' into blender2.8

2016-11-07 15:46:27 +01:00

blenderplayer

Merge branch 'master' into blender2.8

2016-11-07 15:46:27 +01:00

creator

Merge branch 'master' into blender2.8

2016-11-07 15:46:27 +01:00

gameengine

BGE: remove calls to GLSL support query (it's always supported)

2016-10-10 01:19:10 -04:00

tools @ 896c5f7895

Point submodules to latest master branches

2016-09-02 11:44:22 +02:00

CMakeLists.txt

Move tests into tests/ top-level dir

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