Blender Git Loki

Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr

# Conflicts:
# source/tools

Increased the amount of faces the inco check will search

Fix memleak when creating eval

Remove opti vert dissolve

Merge branch 'blender2.8' into greasepencil-object

Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr

# Conflicts:
# source/blender/draw/CMakeLists.txt
# source/blender/makesrna/intern/rna_scene.c

Fixed still frame render cache out of date error.

Merge branch 'blender2.8' into greasepencil-object

Fixed vertical line missed calculations.

Partly fixed "Absolute horizontal/vertical" situations.

Fixed contour priority. Fixed software mode line type shader.

Merge branch 'soc-2018-npr' of git.blender.org:blender into soc-2018-npr

Fixed line width incorrect variations under different aspect ratios. commented weird code in culling.

Fixed line width incorrect variations under different aspect ratios.

Fixed software mode ortho condition errors in culling. Now working.

Fixed DPIX ortho view.

Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr

# Conflicts:
# source/blender/makesdna/DNA_scene_types.h

Merge branch 'blender2.8' into greasepencil-object

Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr

# Conflicts:
# source/blender/makesdna/DNA_scene_types.h

Fixed collection header name