Blender Git Loki

Fix collision multithreading inconsistency

Multithreading makes collisions be detected in different orders, causing
the clustering step of collision resolution to generate possibly
slightly different results on each run. This commit makes collision
order consistent.

Fix mistake in collision indexing

Cycles: Moved Texture caching options to their own subsection in the UI.

Fix interface lock situation reported by DarkDefender.

Merge branch 'master' of git.blender.org:blender into cycles_texture_cache

Draw mode for hair follicles in edit mode.

Fix const-ness of hair primitive pointers for screen vertex callbacks.

Iterator functions and macros for hair primitives.

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

Cycles: Improved robustness of hair motion blur.

In some instances, the number of control vertices of a hair could change mid-frame.
Cycles would then be unable to calculate proper motion blur for those hairs. This adds
interpolated CVs to fill in for the missing data. While this will not necessarily result in
a fully accurate reconstruction of the guide hair, it preserves motion blur instead of disabling it.

avoid duplicate deletion of temporary items

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

Merge branch 'blender2.8' into asset-engine

Conflicts:
release/scripts/startup/bl_ui/space_filebrowser.py
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/versioning_280.c
source/blender/blenloader/intern/versioning_defaults.c
source/blender/editors/include/UI_interface.h
source/blender/editors/space_view3d/space_view3d.c
source/blender/windowmanager/WM_api.h
source/blender/windowmanager/intern/wm_dragdrop.c
source/blender/windowmanager/intern/wm_files_link.c

Cycles: Fixed some warnings.

Merge branch 'cycles_embree' of git.blender.org:blender into cycles_embree