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-11 22:05:20 +02:00
2016-07-10 14:52:00 +02:00
2016-07-02 10:08:33 +10:00
2016-07-14 17:30:52 +10:00
2016-07-18 13:09:41 -06:00
2016-08-06 12:45:03 +02:00
2016-01-04 14:20:48 +05:00
2016-07-02 10:08:33 +10:00
2016-07-02 10:08:33 +10:00
2016-01-04 14:20:48 +05:00
2016-07-02 10:08:33 +10:00
2015-03-27 18:23:31 +05:00