Blender Git Loki

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

Implementation of a target density feature for the hair simulation.

This allows setting a target density which the fluid simulation will
take into account as an additional term in the pressure Poisson
equation. Based on two papers
"Detail Preserving Continuum Simulation of Straight Hair" (McAdams et al. 2009)
and
"Two-way Coupled SPH and Particle Level Set Fluid Simulation" (Losasso et al. 2008)

Currently the target pressure is specified directly, but it will be
a lot more convenient to define this in terms of a geometric value such
as "number of hairs per area" (combined with hair "thickness").

Another fix for off-by-one hair grid resolution errors.

Rewriting the grid rasterization function for hair segments.

Draw actual hair keys when the "Guide Hair" setting is enabled.

Without this certain debug tasks become very hard to visualize.

Change widget interaction slightly so transform works immediately.

It may be better to use transform code for widgets but this will cause
nested operators for widget/operator and needs some consideration.

For transform e.g. we would have one transform operator taking care of
transformation of the widget, then feeding this back to regular object
transform.

Fix incorrect wrapping of lamp to RNA for widget.

Remove magic numbers

Widgets: inverted/constrained to property range working for properties
(not operators yet).

Now "umbrella" widget type works correctly.

Includes minor cleanup of view3d widgetgroup routines.

correct offset for scaled widgets during interaction

Merge branch 'terrible_consequencer' into gooseberry