Bastien Montagne 9be6d5ff18 Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/blenkernel/intern/depsgraph.c
	source/blender/blenloader/intern/versioning_270.c
	source/blender/depsgraph/intern/builder/deg_builder_relations.cc
	source/blender/makesrna/intern/rna_main_api.c
	source/blender/makesrna/intern/rna_particle.c

2016-12-12 16:17:57 +01: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

[msvc] Changes for new oiio/ffmpeg versions.

2016-12-03 17:38:20 -07:00

creator_args.c

Merge branch 'master' into blender2.8

2016-12-12 16:17:57 +01:00

creator_intern.h

Cleanup split creator.c

2016-02-28 05:23:48 +11:00

creator_signals.c

Refactor BKE_blender into separate headers

2016-04-25 19:27:45 +10:00

creator.c

Merge branch 'master' into blender2.8

2016-09-04 16:41:06 +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