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)
1  2 
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