Blender Git Commit Log

Merge branch 'master' into greasepencil-object

Conflicts:
source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
source/blender/draw/engines/gpencil/gpencil_engine.c
source/blender/editors/gpencil/drawgpencil.c
source/blender/editors/gpencil/gpencil_fill.c
source/blender/editors/gpencil/gpencil_interpolate.c
source/blender/editors/gpencil/gpencil_paint.c
source/blender/editors/gpencil/gpencil_sculpt_paint.c
source/blender/editors/gpencil/gpencil_utils.c