Blender Git Loki

Merge branch 'alembic' into gooseberry

Alembic: Fix wrong detection in Cycles whether cache is to be used for meshes

Alembic: Fix crash of viewport render with strands read from alembic cache

The issue was caused by RNA passing ownership from the cache data used by Blender
to Cycles. This lead to situations when all of a sudden blender looses data it
was expecting to have.

Now instead of passing ownership we're just copying strands from the data, so both
Blender and Cycles are having it's own local data.

Ideally this data will be shared between viewport and Cycles, but that's a bit
more tricky to do without modifying RNA API. Would happen eventually tho.

Merge branch 'alembic' into gooseberry

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

Use mass parameter for setting gravity forces in cached hair sim.

Enabled air drag forces in cached hair sim.

Alembic: Fixes for strict compiler flags

Alembic: Code cleanup, space around unused pointer function argument

Merge branch 'cycles_memory_experiments' into gooseberry

Cycles: Typo in triangle storage tooltip

Merge branch 'alembic' into gooseberry

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

Estimation for overall data size of Alembic components.

This is not accurate, but should give some indication about the most
expensive parts of a cache, so it can be optimized efficiently.

Improved Alembic archive examination tool for cache libraries.

A new panel is added for showing the structure and contents of archives
of a cache library (instead of simply dumping on the terminal). The
archive structure is stored in a lightweight tree structure, mirroring
the hierarchy of objects and properties in Alembic. These
object/property nodes can be expanded individually for easier navigation
through the archive.

Use a dedicated panel for cache library UI instead of appending to the
duplication UI.

Alembic: Make alembic's HDF5 library optional

This way blender will be happy about alembic compiled without HDF5 support.

Fix alembic-cached dupli not updating in Render mode in 3DViews.

Probably a typo? Objects/parents sent to sync_mesh in case of dupli were meaningless...

ShapeKey propagate operator for hair edit mode.

This implements roughly the same functionality as the equivalent mesh
shape propagate operator, with some tweaks specific to hair editing.

The operator copies selected points to all the shape keys. Unlike meshes
these points may be shifted afterward to achieve consistent segment
length (this can be avoided by selected entire strands before using the
operator).

Merge branch 'master' into alembic

Fix for particle shape key editing to prevent losing shape data
when switching the active key.

Particle shapes were always using the relative blending of keys when
evaluating hair data. This works ok for meshes, because their edit data
is entirely separate from the mesh data (using bmesh). For particles,
however, the edit mode is hardwired to the hair data, so when switching
keys in edit mode we must take care to replace everything with the
shape. Otherwise the hair data will be using blender shapes and the edit
data will overwrite any shape keys with that.

Placeholder image strips feedback session changes no.2:

Change paths operator can also have the same placeholder logic now