Blender Git Loki

Add Mesh's counterpart to BM_mesh_topology_hash.

Fix stupid logic error.

Use new BLI_hash_mm2a.

Fallback method for defining density in the hair grid using discrete
samples.

This is just an intermediate method to make sure the density is valid.
Eventually the closest-point method should be used, but for testing
the poisson solver this is easier to debug.

Merge branch 'master' into soc-2014-shapekey

Added a margin to the number of cells used in the poisson grid solver,
to ensure we always have one layer of empty cells around the fluid.

Merge branch 'master' into gooseberry

Revert "View3D: Walk Navigation - Unreal Engine modes and keymap"

This reverts commit 6819b7f26584aaf6b389a71d9994e7f94e4fb117.

View3D: Walk Navigation - Unreal Engine modes and keymap

(squashed from epic-navigation)

Merge remote-tracking branch 'origin/master' into experimental-build

Revert "View3D: Walk Navigation - Unreal Engine modes and keymap"

This reverts commit 6ab9f1b4920bc7579dd61eedde7079172fa6be03.

View3D: Walk Navigation - Unreal Engine modes and keymap

Merge remote-tracking branch 'origin/master' into testbuild

Conflicts:
release/datafiles/locale
release/scripts/addons

Fixup for MMB and LMB moves not working, introduced in last commit

Final adjustments to keymap

Cleanup pre-review

Navigation fully working

* Now you can start navigating with the arrows keys directly.

Keymap for arrows keys (and +, -)

Support for non-modal navigation (arrows)

Merge remote-tracking branch 'origin/master' into epic-navigation