Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 28 Jul 2017 20:44:04 +0000 (06:44 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 28 Jul 2017 20:44:04 +0000 (06:44 +1000)
commit0e26707bce243daece1c699c223d5f26d7d45e48
tree466bf7be78afa4d0e7f44a2b1f8206c91506f27d
parentc558763ef562d407384dba37ffab612099df4916
parent214bbd4c027518c24bcd8e7eaf5226453e2e978c
Merge branch 'master' into blender2.8
source/blender/editors/interface/resources.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/intern/rna_userdef.c
source/blender/windowmanager/intern/wm_event_system.c