Blender Git Commits

Merge branch 'master' into gooseberry

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

automatically create inner (and outer) material if not specified

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).

Depsgraph: Fix compilation with scons and compositor enabled

Rework of 'mixing' part, to make it more consistent across the whole code.

Things seams partly broken though, now... :/

Moar cleanup.

Fix: Stroke filling was incorrectly propagated to the following layers

This was noticeable when the enabling onion skinning on a layer without
fills which follows one which does.

Merge remote-tracking branch 'refs/remotes/origin/master' into fracture_modifier

Conflicts:
source/blender/blenkernel/intern/pointcache.c
source/blender/blenkernel/intern/rigidbody.c

Merge branch 'master' into mesh-transfer-data

On second though, allow modifier to create vgroups too.

This is rather hard to handle in fact, should a modifier be allowed to create vgroups,
when it cannot delete them really (because vgroups are defined at object level, not CD / DM level)?
Open question for review! :P

Also, fixed some (stupid) bugs, fixed some potential bugs, and did some cleanup.

triggered objects dont need to be fractured any more and restore kinematic after load

Merge branch 'master' into GPencil_EditStrokes

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.

Depsgraph: Add depsgraph update function to the hook modifier

This is mainly to test how this is expected to work and it seems
to be rather straightforward. Now new depsgraph can use hook :)

Depsgraph: Forgot this in previous commit