Blender Git Loki

Merge branch 'master' into gooseberry

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

Use depsgraph tagging and notifiers to enforce dupli cache updates
in the viewport.

Explicit flags for toggling motion (from simulation) and child strands
in both display and render of caches.

External forces in strand hair simulation.

Arbitrary wind force "density" factor has been moved out of the force
function now, so cloth simulation can do this on it's own without
affecting the strand sim.

Goal springs for cached strand simulation.

In addition to the original particle hair sim settings the parameters
for strand sim have a curve to define the strength of goal springs along
strands. This useful because currently there is no way to override the
weights of strands. This would require a new particle edit mode that can
work with non-particle data in a sane way ...

Disable the UI for drawing objects of cache libraries.

This takes an arbitrarily large amount of space in the UI and does
currently not have a good purpose.

Eventually this information could be displayed in a dedicated part of
the UI, with proper scrolling.

Added visibility attribute for dupli objects in Alembic caches.

This combines the DupliObject.no_draw flag with the instanced object's
visibility.

Merge branch 'master' into gooseberry

Fix for potential memory corruption in selection drawing code.

This code works much like the main object drawing code and has to take
the same precautions regarding replacing the derivedFinal pointer in
Objects. This pointer may be replaced during drawing calls, regardless
of the "ownership" indicated by needsFree.

Check for empty schemas more consistently before trying to read.

Reading from an empty object in Alembic will throw an exception, which
is not easily handled yet. So rather avoid annoying crashes the clumsy
way for now.

Writer for child strand data.

Cache chains now support child strands too, instead of dropping
child data when writing out from strand data.

Merge branch 'alembic' into gooseberry

Extra changes to make strict flags happy

Merge branch 'master' into gooseberry

Fix compilation with strict compiler flags

Extended Cycles to support both parent and child strands.

The code for syncing Strands and StrandsChildren data to Cycles curves
is almost identical, so to avoid code duplication a little templated
traits type has been defined, which provides the appropriate accessors
for both cases. This is very local and should not be too confusing.

Cache reader for child strands.

This creates child strands along with the parents. These are not yet
deformed by parents or simulation, and are also not written back into
subsequent caches yet.

Store child strand curves alongside the parent strands in dupli object
data.

Child strands have their own struct type for vertices and curves to
avoid unnecessary overhead (parent curves store a full 3x3 matrix after
all).

Child strands may be constructed from particle pathcaches, or read from
curves data in alembic files.

Nominal support for UVs and Vcols with cached strand data.

These are dummy values currently. The UV and vcol values will be stored
in strands directly, unlike particles which evaluate them every time;
this is a much safer and more efficient approach that makes strand data
truely independent from the "emitter" mesh. Such data will be made
available later, primarily for child curves.

Merge branch 'alembic' into gooseberry