Blender Git Commit Log

Merge remote-tracking branch 'origin/render-layers' into clay-engine

# Conflicts:
# source/blender/editors/space_view3d/drawobject.c
# source/blender/gpu/intern/gpu_viewport.c