Blender Git Loki

Check for valid scalp before running the test hair operator.

Mantaflow: Added preprocessed Mantaflow source files

Preprocessed files for both OpenMP and TBB

Fix merge error in view3d ui script.

Merge branch 'blender2.8' into hair_object

Rename INFO menu to VIEW3D.

Merge branch 'blender2.8' into hair_object

Revert "Workbench: Add Curvature overlay for better visibility of surface detail for e.g. sculpting"

This reverts commit e9a60ce199200e25d2a6e9d722ad7e8de8cab206.

Workbench: Add Curvature overlay for better visibility of surface detail for e.g. sculpting

The approach is fairly simple, just apply an edge detection filter to the view normal and scale the brightness based on that.

The overlay is disabled at object boundaries to avoid dark lines around objects.

Generally, this implementation follows the proposal of @monio at https://blender.community/c/rightclickselect/J9bbbc.
The changes are:
- Radius of two pixels instead of one - might not be better, though, needs some feedback
- Options to reduce the strength of both ridges and valleys
- Tweaked function for the strength reduction (the original method actually had a local maximum, resulting in a brighter line inside valleys)
- Multiplication for blending instead of overlay, which doesn't work reliably with scene-referred intensities
- Renamed to point out the distinction between it and the SSAO-based cavity overlay

Reviewers: jbakker

Subscribers: linko, monio

Differential Revision: https://developer.blender.org/D3617

Merge remote-tracking branch 'origin/blender2.8' into experimental-build

Merge branch 'blender2.8' into hair_object

Merge remote-tracking branch 'origin/blender2.8' into collada2.8

Merge branch 'blender2.8' of git.blender.org:blender into blender2.8

Merge branch 'collada' into blender2.8

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

fix: Collada: Error handler does not report Parsing errors and continues processing instead of stopping the import/export

Merge branch 'master' into collada

Revert "Text overflow option tests"

This reverts commit 68da165ff2fc5f5bafe074aeadd5f27e8f41967c.

Text overflow option tests

Merge remote-tracking branch 'origin/blender2.8' into experimental-build

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