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

..

extern/include

Support multiple tangents for BI render & viewport

2016-04-26 20:43:29 +10:00

intern

Merge branch 'master' into blender2.8

2016-05-24 16:48:10 +02:00

CMakeLists.txt

Refactor translation code out of blenfont

2015-08-18 07:01:26 +10:00