Blender Git Loki

Merge branch 'master' into wiggly-widgets

Merge branch 'hair_immediate_fixes' into gooseberry

Merge branch 'master' into gooseberry

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

Merge branch 'master' into hair_immediate_fixes

Fix for color-wire auto-contrast

Merge branch 'master' into gooseberry

Exposing customdata mask layer (CD_PAINT_MASK) to Python API

There are several more or less new customdata layers that currently cannot be accessed via Python (or some are exposed via BMesh API but not via Mesh API). This patch aims to expose one of those layers - CD_PAINT_MASK.
It'd be pretty useful for existing and future addons targeting sculpt workflow. Currently to get some access to the mask we employ a hackish approach via hiding/revealing masked vertices, this adds mode switches and doesn't allow to get actual mask values which could be useful if converted into vertex group weights for later use in e.g. modifiers. With this patch we'd be able to access mask data directly.

Reviewers: campbellbarton

Reviewed By: campbellbarton

Subscribers: radcapricorn

Projects: #bf_blender

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

Implemented PIC and FLIP methods for combining the fluid grid simulation
with the Lagrangian hair model.

Main solver step for generating a divergence-free hair velocity field
on the grid.

This uses the Eigen conjugate-gradient solver to solve the implicit
Poisson equation for the pressure Laplacian:

div(grad(p)) = div(v)

As described in "Detail Preserving Continuum Simulation of Straight Hair"
(McAdams, Selle, 2009).

Allow separate widget data per editor.

To make this work, we need separate type/instance for the widgets. This
is a bit ugly but it is necessary if we want widgets on each editor to
depend of per editor-options or visibility state.

Support undo. Scale stays same for non-3D widgets

Pampering the stupid MSVC compiler again, it fails to build valid C code.

Merge branch 'master' into gooseberry

Added new header for Eigen utility classes.

These make passing data between Eigen vector and matrix types and plain
C arrays more convenient.

Updated a few comments.

Compile hair volumetrics code as C++, so we can use Eigen easier.

Minor debug code fix.

Use a fixed, uniform cell size for hair continuum grids.

This is a bit more awkward for artists to use, but necessary for
a stable solution of the hair continuum calculation. The grid size is
defined by the user, the extent of the grid is then calculated based on
the hair geometry. A hard upper limit prevents bad memory allocation
in case too small values are entered.

Removed unused voxel_filter_size DNA property.

This is an artifact of earlier attempts to implement velocity smoothing,
but doesn't work anyway.

Renamed HairVertexGrid to HairGrid, since it's not actually storing
hair vertex data.