Blender Git Loki

Merge remote-tracking branch 'origin/master' into lanpr-under-gp

# Conflicts:
# source/blender/editors/include/ED_geometry.h
# source/blender/editors/lineart/lineart_ops.c
# source/blender/editors/mesh/editmesh_intersect.c
# source/blender/editors/object/object_facemap_ops.c
# source/blender/gpu/CMakeLists.txt
# source/blender/gpu/intern/gpu_batch.cc
# source/blender/gpu/intern/gpu_context_private.hh
# source/blender/gpu/intern/gpu_immediate.cc
# source/blender/gpu/intern/gpu_immediate_private.hh
# source/blender/gpu/intern/gpu_platform_private.hh
# source/blender/gpu/intern/gpu_primitive_private.h
# source/blender/gpu/intern/gpu_query.cc
# source/blender/gpu/opengl/gl_batch.cc
# source/blender/gpu/opengl/gl_context.cc
# source/blender/gpu/opengl/gl_drawlist.cc
# source/blender/gpu/opengl/gl_immediate.cc
# source/blender/python/intern/bpy_rna_ui.h