Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 6 Feb 2018 12:06:23 +0000 (23:06 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 6 Feb 2018 12:06:23 +0000 (23:06 +1100)
commit5376c739f5bf4029e0a32946e9945a732feba217
treeb3494e69541d22edf5b971106b532e3a2a2577cd
parent98dcd33238e44984d31d96e2ffd0191a5d1cf7b6
parent486e2547eea3f12bfde70f2526dde08f39a8722b
Merge branch 'master' into blender2.8
intern/cycles/device/device.h
release/scripts/startup/bl_ui/properties_particle.py
source/blender/CMakeLists.txt
source/blender/editors/include/ED_object.h
source/blender/editors/object/object_edit.c
source/blender/makesdna/DNA_object_types.h