Blender Git Loki

Merge branch 'blender2.8' into greasepencil-object

# Todo's / Need Further Review:
# - material.c - "man->gpcolor = NULL" (commented out for now)
# - rna_material.c - "rna_Material_update()" - Should GP material settings use their own update?
# - GP Modifiers typedefines need updating for the new struct layout
# - Merge conflicts in properties_gp_common.py - Mostly due to panels being removed in GP branch
# - GP Panels in 3D View (toolbar/topbar fixes postponed till after branch merge)
# - GP "Paper" Option/Settings (should become overlay? Design work needed)

# Conflicts:
# release/scripts/addons
# release/scripts/addons_contrib
# release/scripts/startup/bl_ui/properties_grease_pencil_common.py
# release/scripts/startup/bl_ui/space_view3d.py
# release/scripts/startup/bl_ui/space_view3d_toolbar.py
# source/blender/blenkernel/BKE_modifier.h
# source/blender/blenkernel/intern/material.c
# source/blender/editors/object/object_transform.c
# source/blender/editors/space_outliner/outliner_select.c
# source/blender/gpu/intern/gpu_shader.c
# source/blender/makesrna/intern/rna_material.c
# source/blender/modifiers/intern/MOD_armature.c
# source/blender/modifiers/intern/MOD_array.c
# source/blender/modifiers/intern/MOD_bevel.c
# source/blender/modifiers/intern/MOD_boolean.c
# source/blender/modifiers/intern/MOD_build.c
# source/blender/modifiers/intern/MOD_cast.c
# source/blender/modifiers/intern/MOD_cloth.c
# source/blender/modifiers/intern/MOD_collision.c
# source/blender/modifiers/intern/MOD_correctivesmooth.c
# source/blender/modifiers/intern/MOD_curve.c
# source/blender/modifiers/intern/MOD_datatransfer.c
# source/blender/modifiers/intern/MOD_decimate.c
# source/blender/modifiers/intern/MOD_displace.c
# source/blender/modifiers/intern/MOD_dynamicpaint.c
# source/blender/modifiers/intern/MOD_edgesplit.c
# source/blender/modifiers/intern/MOD_explode.c
# source/blender/modifiers/intern/MOD_fluidsim.c
# source/blender/modifiers/intern/MOD_hook.c
# source/blender/modifiers/intern/MOD_laplaciandeform.c
# source/blender/modifiers/intern/MOD_laplaciansmooth.c
# source/blender/modifiers/intern/MOD_lattice.c
# source/blender/modifiers/intern/MOD_mask.c
# source/blender/modifiers/intern/MOD_meshcache.c
# source/blender/modifiers/intern/MOD_meshdeform.c
# source/blender/modifiers/intern/MOD_meshsequencecache.c
# source/blender/modifiers/intern/MOD_mirror.c
# source/blender/modifiers/intern/MOD_multires.c
# source/blender/modifiers/intern/MOD_none.c
# source/blender/modifiers/intern/MOD_normal_edit.c
# source/blender/modifiers/intern/MOD_ocean.c
# source/blender/modifiers/intern/MOD_particleinstance.c
# source/blender/modifiers/intern/MOD_particlesystem.c
# source/blender/modifiers/intern/MOD_remesh.c
# source/blender/modifiers/intern/MOD_screw.c
# source/blender/modifiers/intern/MOD_shapekey.c
# source/blender/modifiers/intern/MOD_shrinkwrap.c
# source/blender/modifiers/intern/MOD_simpledeform.c
# source/blender/modifiers/intern/MOD_skin.c
# source/blender/modifiers/intern/MOD_smoke.c
# source/blender/modifiers/intern/MOD_smooth.c
# source/blender/modifiers/intern/MOD_softbody.c
# source/blender/modifiers/intern/MOD_solidify.c
# source/blender/modifiers/intern/MOD_subsurf.c
# source/blender/modifiers/intern/MOD_surface.c
# source/blender/modifiers/intern/MOD_surfacedeform.c
# source/blender/modifiers/intern/MOD_triangulate.c
# source/blender/modifiers/intern/MOD_uvproject.c
# source/blender/modifiers/intern/MOD_uvwarp.c
# source/blender/modifiers/intern/MOD_warp.c
# source/blender/modifiers/intern/MOD_wave.c
# source/blender/modifiers/intern/MOD_weightvgedit.c
# source/blender/modifiers/intern/MOD_weightvgmix.c
# source/blender/modifiers/intern/MOD_weightvgproximity.c
# source/blender/modifiers/intern/MOD_wireframe.c