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-04-27 15:47:49 +10:00
2016-05-24 16:48:10 +02:00
2016-05-23 21:35:54 +10:00
2016-05-24 16:48:10 +02:00
2016-05-24 16:48:10 +02:00
2016-05-14 23:01:59 +10:00
2016-04-30 04:10:34 +10:00
2016-05-05 19:46:06 +02:00
2016-02-20 14:06:09 +05:00
2016-05-24 16:48:10 +02:00
2016-05-24 16:48:10 +02:00
2016-05-17 21:39:16 +02:00
2016-05-24 16:48:10 +02:00
2016-01-04 14:20:48 +05:00
2016-05-06 11:49:09 +02:00
2016-05-24 16:48:10 +02:00
2016-05-24 16:48:10 +02:00
2016-05-24 16:48:10 +02:00
2016-05-24 16:48:10 +02:00
2016-05-06 06:14:36 +10:00
2016-05-21 16:46:42 +02:00
2016-01-04 14:20:48 +05:00
2016-05-24 16:48:10 +02:00
2016-05-24 16:48:10 +02:00
2016-04-13 18:10:23 +02:00