Blender Git Commits

Merge branch 'fcurves-simplify' into gooseberry

Cycles: Free hires smoke data from blender side after scene was fully synchronized

This happens if all object's smokes are backed to files and rendering is either
happening from command line of with locked interface.

The idea behind this change is to make as much memory available for path tracing
as possible, so after heavy swapping during synchronization period there's loads
of free memory to put important data back to RAM.

Merge branch 'master' into gooseberry

Conflicts:
source/blender/blenkernel/intern/key.c
source/blender/blenlib/intern/path_util.c
source/blender/editors/object/object_shapekey.c

Initial fcurve simplification code.

Notes:
* This is own coocking, since it seems hard to find papers on simplifying already existing bezier curves,
and we do not really need the 'generic' least-square fitting of bezier in a set of points, here.
* It takes advantage of specificities of FCurves (e.g. only difference that matters here is Y value at same X frame,
no vertical overlapping, etc.).
* It gives reasonably good results, but could most likely be enhanced quite a bit still.
* Only 'hooked' to bake action operator right now (needs more work to add it to graph editor too).
* Ultimately should probably be redone in C. Would keep it in Python until we have a real good
cleanup behavior though, much easier to experiment in later language.

Clear previous collapsed data if needed.

Refactor: move all collapsed image variables into a struct.

Merge branch 'master' into cycles_memory_experiments

Conflicts:
intern/cycles/blender/blender_object.cpp
intern/cycles/blender/blender_sync.h
intern/cycles/render/graph.h
intern/cycles/render/mesh.cpp

Fix issue with collapsed images during last weekly.

We need to clear the collapsed flag when it does not apply anymore, so
files get displayed properly.

Do not show fps while scrubbing.

Do not store frame change in undo stack (causes much waiting for
animators in heavy scenes)

Merge branch 'master' into gooseberry

Indicator for the player (togglable with I key).

Draws a green line where the current frame is in the movie.

Collapsed images:

* Icon of collapsed images is same as a movie
* Size displayed is cummulative size of all images
* Frame range is displayed in the filename

Merge branch 'alembic' into gooseberry

Fix outdated stub factory class for pointcache when Alembic is disabled.

Disable collapse images option after operator ends.

Collapse image sequence feature now uses BLI_path_* functions to detect
filenames.

Fix stupid recent mistake

Merge branch 'master' into gooseberry

Conflicts:
source/blender/makesdna/DNA_object_types.h

Make clamping able to return to exact previous values.