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

Conflicts:
	source/blender/editors/object/object_add.c
	source/blender/editors/object/object_select.c
	source/blender/editors/space_outliner/outliner_edit.c

2018-05-31 16:21:47 +02:00

..

blender.map

Fix T46799: Blender crashes when enumerating POCL devices

2015-11-27 14:48:26 +05:00

buildinfo.c

Further tweaks to buildinfo

2013-11-15 18:05:27 +06:00

CMakeLists.txt

Merge branch 'master' into blender2.8

2018-05-22 08:49:24 +02:00

creator_args.c

Merge branch 'master' into blender2.8

2018-05-31 16:21:47 +02:00

creator_intern.h

Removing Blender Game Engine from Blender 2.8

2018-04-17 17:51:28 +02:00

creator_signals.c

Removing Blender Game Engine from Blender 2.8

2018-04-17 17:51:28 +02:00

creator.c

Cleanup: move toolsystem into own include

2018-05-23 08:23:16 +02:00

osx_locals.map

OSX: make some more symbols global only, this may prevent clashes on older systems and is good for loading times anyway.

2014-09-19 15:00:15 +02:00