Blender Git Commits

Merge branch 'master' into gooseberry

Simplification of the cache library filtering mechanism.

Now the filtering is simply based on the data types that should go into
the cache, instead of selecting each object and component individually.

This is slightly more limited and may need to be revisited again later,
but for the time being it is much less confusing and clumsy. Filtering
by objects can be accomplished by creating groups accordingly. Making
groups specifically for caching is totally acceptable.

Merge branch 'alembic' into gooseberry

Fix for crash on dupli drawing, due to check of ob.transflag after it
is already restored.

Merge branch 'alembic' into gooseberry

Fix for crashes when changing draw types that affect dupli objects.

The draw code was restoring the derivedFinal mesh unconditionally after
drawing duplis. However, the drawing code can in some cases replace the
derivedFinal pointer during drawing (bad!). This then leads to invalid
pointer access.

Fix is to only touch the derivedFinal when it's actually a dupli cache
mesh.

Merge branch 'alembic' into gooseberry

`cachelibrary.modifier_bake operator` has been removed in favor of
`cachelibrary.bake`.

Simplified functions for generating absolute file paths from the base
cache library and modifiers.

Sanity check: motion state data in curves is optional.

Preliminary fix for bad level calls to WM job functions from BKE.

The job invocation should happen only in editors/. Also it makes sense
to modify the bake operator such that it supports both the basic cache
library and an optional modifier output.

The design for this area is in progress anyway, probably the cache
library archive paths will be changed so that there is always one input
and optionally an output path, with all the modifiers working in
sequence.

Write out the complete dupli group in cache modifiers.

Theoretically we could write a stitcher that writes only the parts of
the data affected by a modifier and simply copies the rest, but this
is much more involved and not necessary at this point.

Removed unused code for ill-defined "cache objects".

The cache libraries now work based on dupli objects instead of
recursive group content, so this concept is no longer needed.

Merge branch 'master' into gooseberry

Merge branch 'alembic' into gooseberry

Merge branch 'master' into gooseberry

Merge branch 'master' into gooseberry

Conflicts:
release/scripts/startup/bl_ui/properties_physics_smoke.py
source/blender/editors/include/ED_transform.h
source/blender/editors/space_view3d/view3d_intern.h

Alebic: Fix compilation error of blenderplayer target on buildbot

Writer for strand data and extension for the new motion state data.

Unlike the particle hair writer this one does not work with the particle
system data but the new Strands data. This will allow successive
manipulations of cached hair data by first storing the initial particle
grooming data ("hair edit"), read this data from the cache into a
Strands instance, then apply hair simulation and write the result back
into a second Strands cache.

Added optional motion state data to Strands.

This implements the distinction between the strand goal position
(grooming data, shape keys) and the result of dynamics simulation.