Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 20 Dec 2017 04:06:22 +0000 (15:06 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 20 Dec 2017 04:06:22 +0000 (15:06 +1100)
commit3143b2f9424a10b1baf960c6a0bbb274cdeffe1d
tree9d2095cc94207268aa0160a34db0eb27317e5af7
parentb3bcbc9e85aaad3c6262e8203c69d4089d5d8154
parent51f0c3fadf085b087a9f98a59db41af6aa632a57
Merge branch 'master' into blender2.8
intern/cycles/blender/addon/properties.py
source/blender/blenkernel/intern/curve.c
source/blender/blenkernel/intern/object_dupli.c
source/blender/editors/include/UI_interface.h
source/blender/editors/interface/interface_handlers.c
source/blender/editors/interface/interface_intern.h
source/blender/editors/interface/interface_region_tooltip.c
source/blender/makesrna/intern/rna_rna.c