Blender Git Commit Log

Merge branch 'master' into temp_viewport_fx_merge

Conflicts:
source/blender/editors/gpencil/drawgpencil.c
source/blender/editors/space_sequencer/sequencer_draw.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/editors/transform/transform.c