Blender Git Commits

Skeleton code for sampling meshes.

Conflicts:
source/blender/blenkernel/CMakeLists.txt

Merge branch 'master' into cycles_memory_experiments

Merge branch 'master' into gooseberry

Merge branch 'master' into alembic

Merge branch 'alembic' into gooseberry

Fix for stupid MSVC, does not allow const expression as array size.

Revert 0d3da1343c16e1be6a6e6b78b77cf8b3354afe07

Disabling group -> duplicator dependencies would in theory make caches
more attractive because the invisible objects don't have to be updated
just because of the group.

However, the viewport and render starts to behave unpredictably without
these updates, because the dupli cache relies in many ways on the
objects it is supposed to override.

Merge branch 'master' into gooseberry

Some minor fixes needed to build alembic with install_deps.sh.

Merge branch 'cycles_memory_experiments' into gooseberry

Cycles: Add debug option to disable pre-aligned triangles storage

This option makes it so BVH does not use pre-aligned storage for triangle vertex
coordinates which was originally needed for faster coordinate lookup when doing
triangle intersection test. This array gives up to 10% performance comparing to
fetching individual coordinates but it also used 12 floats per BVH primitive,
which might translate to quite huge array in a complex scene.

Intention of this option is to investigate if this is a right direction to make
gooseberry files being able to render on local farm which is not totally great
in memory.

Current approach is not totally cheap, meaning even the case with the storage
enabled might be slower, but currently it's within 1%.

Merge branch 'alembic' into gooseberry

Conflicts:
source/blender/physics/intern/BPH_mass_spring.cpp

Merge branch 'master' into gooseberry

"Deflector" force modifier for cache simulation.

This works like the existing effectors when using "surface" mode: It
selects the closest point on the mesh surface and creates a force based
on distance and falloff.

Unlike the old effectors it also supports signed distance, based on
the surface normal, which gives more control over the allowable distance
of strands to the mesh surface.

New cache modifier type for creating force fields on duplis of the
cached group itself.

This allows using the dupli group objects themselves as force fields,
in particular for collision objects in strand simulation. Without this
feature only the original objects of are recognized by the effectors
system, and even if duplis worked properly their settings would not be
accessible due to linking and dupli group hiding. The cache modifier
circumvents this issue by providing a new force field system, separate
from the current effectors.

Merge branch 'cycles_memory_experiments' into gooseberry

Merge branch 'alembic' into gooseberry

Revert recent commits, no time to improve things now.

Merge branch 'master' into cycles_memory_experiments

Merge branch 'master' into gooseberry

Conflicts:
source/blender/editors/space_view3d/drawobject.c