Blender Git Loki

Merge branch 'soc-2021-porting-modifiers-to-nodes-solidify' into soc-2021-porting-modifiers-to-nodes

# Conflicts:
# release/scripts/startup/nodeitems_builtins.py
# source/blender/blenkernel/BKE_node.h
# source/blender/geometry/CMakeLists.txt
# source/blender/makesrna/RNA_enum_types.h
# source/blender/modifiers/CMakeLists.txt
# source/blender/nodes/NOD_static_types.h