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-06-07 09:59:26 +02:00
2015-01-29 15:35:06 +11:00
2016-08-06 10:58:13 +02:00
2015-08-22 18:16:55 +12:00
2016-08-01 11:55:06 +10:00
2016-05-18 10:56:57 +02:00
2016-07-15 15:50:42 +10:00
2015-01-29 15:35:06 +11:00
2016-03-13 02:05:36 +01:00
2015-01-29 15:35:06 +11:00
2015-05-03 15:18:27 +02:00
2015-01-29 15:35:06 +11:00
2016-08-06 12:45:03 +02:00
2015-01-29 15:35:06 +11:00
2015-09-01 13:03:38 +10:00
2016-07-27 19:00:35 -07:00
2016-08-06 03:49:14 +12:00
2015-04-22 16:26:54 +10:00
2015-05-22 16:03:38 +02:00
2015-01-29 15:35:06 +11:00
2016-04-12 16:28:00 +02:00
2016-08-06 12:45:03 +02:00
2016-08-06 12:45:03 +02:00
2016-08-06 12:45:03 +02:00
2016-07-27 19:00:35 -07:00
2016-07-27 19:00:35 -07:00
2016-07-27 19:00:35 -07:00
2016-07-27 19:00:35 -07:00
2016-08-06 12:45:03 +02:00
2016-08-06 12:45:03 +02:00
2015-08-08 20:55:51 +02:00
2016-07-05 21:59:02 +02:00
2016-04-28 18:38:10 +02:00
2016-04-12 16:28:00 +02:00
2016-07-27 19:00:35 -07:00
2016-08-03 23:39:36 +02:00
2016-06-22 07:47:30 +10:00
2016-08-06 12:45:03 +02:00
2015-10-16 11:21:12 +02:00
2016-06-24 03:18:34 +12:00
2016-08-03 23:39:36 +02:00
2016-08-06 10:58:13 +02:00
2016-06-22 07:47:30 +10:00
2016-07-08 01:47:32 +12:00
2016-08-03 23:39:36 +02:00
2016-06-22 07:47:30 +10:00
2014-01-27 18:42:11 +11:00
2016-08-03 23:39:36 +02:00
2016-06-22 07:47:30 +10:00
2016-06-22 13:12:44 +02:00
2016-07-25 15:07:17 +02:00
2016-08-06 12:45:03 +02:00
2016-08-06 12:45:03 +02:00