Bastien Montagne
9843921288
Merge branch 'master' into blender2.8
Conflicts:
release/scripts/startup/bl_ui/properties_particle.py
release/scripts/startup/bl_ui/properties_physics_cloth.py
release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
release/scripts/startup/bl_ui/properties_physics_softbody.py
source/blender/blenkernel/BKE_library.h
source/blender/blenkernel/BKE_particle.h
source/blender/blenkernel/intern/cloth.c
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/library_query.c
source/blender/blenkernel/intern/particle_system.c
source/blender/blenkernel/intern/scene.c
source/blender/blenkernel/intern/softbody.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/space_file/filesel.c
source/blender/editors/space_outliner/outliner_intern.h
source/blender/makesdna/DNA_ID.h
source/blender/makesdna/DNA_object_force.h
source/blender/makesdna/DNA_particle_types.h
source/blender/makesrna/intern/rna_particle.c
source/blender/makesrna/intern/rna_sculpt_paint.c
source/blender/makesrna/intern/rna_smoke.c
source/blender/makesrna/intern/rna_space.c
2016-08-06 12:45:03 +02:00
..
2016-05-18 22:46:29 +10:00
2016-01-30 18:02:40 +01:00
2015-07-05 13:31:26 -04:00
2014-12-02 17:50:34 +05:00
2015-03-29 03:56:39 +11:00
2016-07-15 02:46:04 +10:00
2016-04-13 10:49:39 +02:00
2016-05-18 22:46:29 +10:00
2016-04-29 15:03:58 +02:00
2016-05-24 16:48:10 +02:00
2016-07-08 00:48:45 +10:00
2016-05-18 22:46:29 +10:00
2015-10-08 15:05:37 +02:00
2015-11-18 10:52:00 +11:00
2015-10-08 15:05:37 +02:00
2016-03-25 13:17:04 +01:00
2015-05-12 16:06:37 +05:00
2016-04-13 10:49:39 +02:00
2016-07-31 01:22:36 -04:00
2012-02-17 18:59:41 +00:00
2015-05-25 00:19:39 +10:00
2016-05-18 22:46:29 +10:00
2016-05-24 16:48:10 +02:00
2015-12-10 01:58:10 +01:00
2016-05-18 22:46:29 +10:00
2015-10-08 15:05:37 +02:00
2014-07-26 18:39:27 +10:00
2015-01-26 16:59:24 +01:00
2014-05-01 04:47:51 +10:00
2015-03-29 03:56:39 +11:00
2016-05-18 22:46:29 +10:00
2016-05-18 22:46:29 +10:00
2016-08-06 10:58:13 +02:00
2015-10-08 15:05:37 +02:00
2015-05-12 16:06:37 +05:00
2015-05-12 16:06:37 +05:00
2016-07-22 04:06:10 +10:00
2016-05-17 21:39:16 +02:00
2015-08-04 22:11:43 +10:00
2016-06-01 00:19:01 +10:00
2016-06-07 09:59:26 +02:00
2016-05-18 22:46:29 +10:00
2016-05-18 22:46:29 +10:00
2016-07-01 19:29:22 +10:00
2016-02-15 19:38:51 +01:00
2016-04-13 10:49:39 +02:00
2016-05-24 16:48:10 +02:00
2016-07-12 00:07:44 +02:00
2015-10-15 00:19:38 +05:00
2015-10-05 15:57:10 +02:00
2015-11-06 01:13:23 +11:00
2016-08-06 12:45:03 +02:00
2015-12-10 01:58:10 +01:00
2015-10-08 15:05:37 +02:00
2016-01-16 15:59:37 +01:00
2016-05-18 22:46:29 +10:00
2016-05-18 22:46:29 +10:00
2015-07-20 16:55:46 +02:00
2014-02-03 19:35:44 +11:00
2015-10-08 15:05:37 +02:00
2016-07-11 15:15:26 +02:00
2016-07-11 15:15:26 +02:00
2016-07-02 10:08:33 +10:00