Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 19 Apr 2018 10:53:21 +0000 (12:53 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 19 Apr 2018 10:53:21 +0000 (12:53 +0200)
commit9d6a175756c8db989fc95bae47bbd1e77ff07980
treec60ad0c6318ac38cba576da2bfd3b792be787a1c
parent0a679c6b685a4a046a9c4074cff8c508d6f91618
parentda82269c58bd7ec1c0ebcb5e1433c731120ec389
Merge branch 'master' into blender2.8
release/scripts/startup/bl_ui/properties_data_modifier.py
source/blender/blenkernel/intern/icons.c
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/interface/interface_icons.c
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesrna/intern/rna_modifier.c
source/blender/modifiers/intern/MOD_particleinstance.c