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
..
2016-01-04 14:20:48 +05:00
2016-05-12 08:15:59 +02:00
2016-01-04 14:20:48 +05:00
2016-05-10 08:29:03 +02:00
2016-05-10 16:14:24 +02:00
2016-04-28 17:33:19 +02:00
2016-01-04 14:20:48 +05:00
2016-03-23 23:40:30 +11:00
2016-03-13 02:05:36 +01:00
2016-01-04 14:20:48 +05:00
2016-02-20 16:45:53 +01:00
2015-03-27 18:23:31 +05:00