Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 15 Feb 2018 11:33:44 +0000 (12:33 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 15 Feb 2018 11:33:44 +0000 (12:33 +0100)
commit2589f55a55bc9682111ab266bb89d8f08713f374
tree6634689ec50057bc782a2c9430ae1059712b0254
parent9d2a699a90d5ce7b976e76f6e1b5c260306b5218
parent6d4022f61980ba46efd391dcfe96dd88a8db8deb
Merge branch 'master' into blender2.8
12 files changed:
release/scripts/startup/bl_ui/properties_particle.py
release/scripts/startup/bl_ui/properties_texture.py
source/blender/blenkernel/BKE_particle.h
source/blender/blenkernel/intern/particle.c
source/blender/blenkernel/intern/particle_child.c
source/blender/blenkernel/intern/particle_system.c
source/blender/blenkernel/intern/smoke.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/space_view3d/drawobject.c
source/blender/makesdna/DNA_particle_types.h
source/blender/makesrna/intern/rna_particle.c