Blender Git Loki

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

Fix 'Children' draw option showing nothing when no children in hairsim/cache

If number of children is zero, even if we do have "valid" children cache, do
not generate children strands from cache...

Placeholder image strips feedback session changes no.1:

Autodetect range of strips.

Placeholders for sequencer take one.

Placeholder images, means that the image sequence reserves a range for
images, displaying black while we wait for them to finish rendering.

This is meant as a feature to not break the layout of gooseberry
sequence edits while we wait for those frames to arrive.

Merge branch 'master' into alembic

Merge branch 'master' into gooseberry

Merge branch 'master' into alembic

Merge branch 'cycles_memory_experiments' into gooseberry

Cycles: Fix threading issue caused by several nodes sharing the same image

Cycles: Replace name-based node matching with type-based

This commit replaces name-based node matching in the mesh device update
with check of special type. It is more robust approach for adding new
nodes which could use image slots for storage. it's also adds updates
of environment texture nodes used in bump shader (this was missing in
the original image sync reshuffle commit).

Particle shapekey code is only in the gooseberry branch, disabled here.

SimDebugData is now global, for easier usage and less intrusive code.

Fix for CustomDataType syntax error from merging.

Use the X mirror option in new strand edit stroke brush tools.

Note that currently this has virtually no effect, because the mirror
option relies on exact positions of vertices, which does not happen with
random hair placement (the add brush has no mirror option yet).

Eventually topological mirroring should help with this case, but is not
implemented for either old or new strand edit yet.

Cleanup: rename function argument for consistency.

Utility methods for mirrored strand editing.

These are a modified version of their BMEditMesh counterparts.

use_topology is not yet implemented for strands. Native strand topology
is not very useful for this. Instead, the topology of the scalp mesh
should be used for finding mirrored strand roots, then the arc- or
parametric length of a vertex from the root to find mirrored verts.

Conflicts:
source/blender/blenkernel/BKE_editstrands.h