Bastien Montagne 160e62b88c Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/blenkernel/BKE_object.h

2018-04-04 15:03:55 +02:00

..

blender

Merge branch 'master' into blender2.8

2018-04-04 15:03:55 +02:00

blenderplayer

Fix blenderplayer (tm)

2018-04-02 17:24:20 -03:00

creator

Merge branch 'master' into blender2.8

2018-04-01 11:03:25 +02:00

gameengine

Merge branch 'master' into blender2.8

2018-04-03 18:12:39 +02:00

tools @ 7695e14cfc

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