Blender Git Commit Log

Merge branch 'greasepencil-object' into temp-greasepencil-object-stacksplit

Conflicts:
source/blender/blenkernel/BKE_gpencil.h
source/blender/blenkernel/intern/gpencil_modifier.c
source/blender/blenloader/intern/readfile.c
source/blender/gpencil_modifiers/intern/MOD_gpencilbuild.c
source/blender/gpencil_modifiers/intern/MOD_gpencilinstance.c
source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c
source/blender/gpencil_modifiers/intern/MOD_gpencilsimplify.c
source/blender/makesdna/DNA_modifier_types.h