Blender Git Loki

Merge branch 'master' into cycles_memory_experiments

Merge branch 'master' into gooseberry

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

Don't write dupli instances to caches in the Render pass.

Duplilists are always generated for viewport/realtime settings, render
settings only affect the mesh geometry but not the duplis.

Cleanup: Removed unused writer/reader classes for Alembic.

These classes were used previously to write parts of the Blender DNA
directly to Alembic. Their code is shared with other classes that are
still in use, so none of the really substantial parts have been deleted.

Cleanup: Removed unused parts of the C API for caching.

This only removes trivial C function wrappers for parts of the C++ code
that are not used directly any more from outside the bl_pointcache
library. Some internal parts may be removed later, this cleanup is
mostly to reduce code noise.

Renamed passes for cache writing to reflect their origin with mesh
modifier evaluation.

Smoke: Fix compilation error with smoke disabled

Remove the dual "root" object at the top of Alembic archives.

Using two full scene nodes for render/realtime data creates a lot of
duplication in both storage and processing time. Instead storing
specific data types like meshes in different versions keeps duplication
to the necessary minimum and allows easier fallback where available.

Merge branch 'cycles_memory_experiments' into gooseberry

Smoke: Fix another crash caused by recent changes

Didn't notice initFie and so are called from constructor for some reason..

Merge branch 'cycles_memory_experiments' into gooseberry

Smoke: Fix wrong bit test in previous commit

Merge branch 'cycles_memory_experiments' into gooseberry

Merge branch 'master' into cycles_memory_experiments

Draw modifiers as inactive when channel modifiers are deactivated.

Smoke: Don't allocate arrays needed for hi-res simulation if smoke is baked to file

There used to be quite huge 3D arrays stored in memory which are only needed for
simulation steps and not used at all if the smoke is baked to file. That memory
is unmanaged by blender and not visible in the info space header and in practice
they could easily be gigabytes for hires smoke.

This commit only addressed hires smoke since it's the more important at this
point, and non-hires smoke wouldn't have such noticeable benefit.

In the case of tornado file it gives around 20% memory saving (which is about
26GB vs. 33GB on later frames of 01.03.02.A3 shot.

Make icon use a dim version instead for modifier muting

Add toggle that disables modifiers on fcurves. Gooseberry request, not
sure how useful it would be on master + it misses an icon, so commiting
here first.

Removed the unused particle writer/reader code from Alembic.

We only use particles to initialize strands export now.

Only process hair simulation in "realtime" mode.

This means no motion state data is generated for render mode, this
requires some larger changes to the way render/realtime data is stored
in the caches.