Blender Git Loki

DPIX normal controlled line width

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

# Conflicts:
# release/scripts/addons

Vertical line hack: tip point threshod fix and a condition branch.

Merge branch 'blender2.8' into greasepencil-object

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

# Conflicts:
# release/scripts/addons_contrib
# release/scripts/startup/bl_ui/properties_physics_cloth.py
# source/tools

Possibly fixed shader errors, but don't know exactly what caused it.

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.