Blender Git Loki

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

# Conflicts:
# source/blender/makesdna/DNA_collection_types.h
# source/blender/makesrna/intern/rna_collection.c

Merge branch 'master' into lanpr-under-gp

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

Merge branch 'master' into lanpr-under-gp

LineArt: Fix Depth comparason error in intersection line occlusion stage.

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

# Conflicts:
# source/blender/gpencil_modifiers/CMakeLists.txt
# source/blender/makesrna/intern/CMakeLists.txt

LineArt: Fix merge problem

Merge branch 'master' into lanpr-under-gp

Conflicts:
source/blender/blenloader/intern/writefile.c

LineArt: Clipped line switch.

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

LineArt: Fixed clipping line data link for new iteration path in contour detection.

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

LineArt: Far clipping

LineArt: Typo

LineArt: Update viewport when changing ObjectLineArt settings.

LineArt: Own crease setting for Object.

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

LineArt: Fix UI ptr code.

LineArt: API fixes.

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