[Bf-blender-cvs] [e527b6d34a6] greasepencil-experimental: Merge branch 'greasepencil-object' into greasepencil-experimental

[Charlie Jolly]

Commit: e527b6d34a63345bbfdb44d5ea4d713d08344e1a
Author: Charlie Jolly
Date:   Sat Jan 5 15:47:49 2019 +0000
Branches: greasepencil-experimental
https://developer.blender.org/rBe527b6d34a63345bbfdb44d5ea4d713d08344e1a

Merge branch 'greasepencil-object' into greasepencil-experimental

# Conflicts:
#	release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
#	release/scripts/startup/bl_ui/space_topbar.py
#	source/blender/blenloader/intern/versioning_280.c
#	source/blender/makesrna/intern/rna_sculpt_paint.c

===================================================================



===================================================================