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-08-06 10:58:13 +02:00
2016-04-19 22:53:18 +02:00
2016-08-06 10:58:13 +02:00
2016-04-19 12:18:19 +10:00
2015-12-08 18:58:52 +01:00
2015-06-01 16:40:43 +10:00
2016-06-07 23:13:27 +02:00
2016-06-22 18:05:55 +02:00
2016-02-21 02:10:29 +01:00
2016-06-25 21:13:33 +10:00
2016-04-16 17:27:49 +02:00
2015-10-20 15:42:30 +11:00
2015-04-07 15:43:06 -03:00