Blender Git Loki

Fixed wrong stride values used for offsetting the index of Eigen values.

The Eigen solver for hair grids uses an extra margin of 1, which means
greater stride values.

Merge branch 'terrible_consequencer' into gooseberry

Conflicts:
source/blender/editors/space_sequencer/sequencer_draw.c

Gooseberry request, snap frame marker during frame setting by holding
ctrl key

Merge branch 'master' into terrible_consequencer

Conflicts:
source/blender/editors/space_sequencer/sequencer_draw.c

Hair grid code was using an invalid hair segment at each hair end with
zero vectors, leading to bad density values.

Merge branch 'viewport_experiments' into gooseberry

A bunch of debug drawing changes.

Fix T42596 crash with DOF on MacOS.

Compiler failed on last shader and failure was not detected. However
compiler error also revealed a blurring error as well :)

Corrected the divergence and gradient calculation for the hair grid
solver input and output.

This uses the central difference method (instead of combined forward/
backward difference), which makes it easier to correctly account for
grid borders.

Merge branch 'master' into gooseberry

Merge branch 'master' into viewport_experiments

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.

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

Merge branch 'master' into gooseberry

Merge branch 'master' into gooseberry

Conflicts:
source/blender/blenkernel/intern/implicit.c

fixes for last merge

Merge branch 'master' into gooseberry

Conflicts:
source/blender/editors/space_sequencer/sequencer_draw.c

Merge branch 'master' into gooseberry

Merge branch 'master' into gooseberry