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

Conflicts:
	intern/cycles/blender/blender_curves.cpp
	source/blender/blenkernel/intern/dynamicpaint.c
	source/blender/blenkernel/intern/particle.c
	source/blender/blenloader/intern/versioning_270.c
	source/blender/editors/physics/particle_edit.c
	source/blender/editors/transform/transform_snap_object.c
	source/blender/editors/util/undo.c
	source/blender/makesrna/intern/rna_object_force.c

2016-05-24 16:48:10 +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

Cleanup: cmake, indentation, line length

2016-05-18 11:58:08 +10:00

creator_args.c

Refactor BKE_blender into separate headers

2016-04-25 19:27:45 +10: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-05-24 16:48:10 +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