Blender Git Loki

Merge branch 'eevee-rewrite' into viewport-compositor

# Conflicts:
# source/blender/blenkernel/BKE_scene.h
# source/blender/blenkernel/intern/scene.c
# source/blender/draw/intern/draw_manager.c
# source/blender/draw/intern/draw_manager.h
# source/blender/nodes/composite/nodes/node_composite_composite.cc