Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 12 Jul 2018 12:46:48 +0000 (14:46 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 12 Jul 2018 12:46:48 +0000 (14:46 +0200)
commit69b7ae839744b63ef6812bf2d1ce72f2ce4e64dc
tree6e30ee4ec724722bcf4e3b5f61625a18b36d85d5
parentc21488df5a830af494d13b353e78cbf81de1595c
parent753a600e354f21618e24e9071ef5d88f1913fcd8
Merge branch 'master' into blender2.8
source/blender/blenlib/BLI_callbacks.h
source/blender/editors/undo/ed_undo.c
source/blender/makesrna/intern/rna_color.c
source/blender/python/intern/bpy_app_handlers.c