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
..
2015-11-05 01:33:50 +11:00
2015-11-05 01:33:50 +11:00
2015-10-28 23:33:25 +09:00
2016-05-18 03:19:06 +12:00
2016-04-12 16:28:00 +02:00
2016-05-24 16:48:10 +02:00
2014-10-03 16:03:49 +02:00
2016-04-01 10:23:39 +11:00