Blender Git Loki

change order of checked expressions in rigidbody object creation -> could crash on non-mesh object

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.

Merge branch 'master' into mesh-transfer-data

Forbid dependency cycle of DataTransfer modifiers, this is just not possible.

(Here I get a segfault inside asan lib iteself, when doing that...)

Cleanup.

Only poly and vertex normals are mandatory for a valid normals, loop
normals may not exist.

Note: Currently we cannot create poly normals explicitly from a modifier,
they have to be recalculated every time ...

Basic profiling code for the mesh cache reader function.

Change default mapping to 'nearest', better than 'topology',
which will error if source and dest are not topo-compatible.

Normals storage support in Alembic mesh caches.

This is not strictly necessary, but removes another step in mesh
reconstruction that might take significant time in extreme cases.

All 3 normal attributes (loop, poly, vertex normals) need to be stored
for successful reconstruction, otherwise they have to be recalculated.

Missed those when reordered loop vs poly code.

Better UI for modifier, based on feedback from first review.