Blender Git Loki

Merge branch 'master' into UI-graphical-redesign

Add widget rollover feedback by implementing a Sub-Button pipeline

As pretty much agreed on in T38070, this implements widget-rollover for
better visual feedback.
The added Sub-Button pipeline should provide us a solid base for future
ideas like using Sub-Buttons to trigger operators (thinking of 'X'-icons
within tabs or menus e.g.), open popups/menus, provide better cursor
feedback, etc. They are basically independent buttons within buttons.

https://developer.blender.org/F187781

Fix for crash on NULL pointer if using the high density grid for
rendering.

Store grids' informations in the node.

Patch by @lukastoenne, with minor edits.

Exporter: decrease tolerance yet again.

Never collapse directories

Animation support for collapsed image sequences.

Selected animation sequences will play back their thumbnails now.

We'll probably need a way to scrub here, will investigate that next.

Gooseberry: Previous commit broke compilation of debug builds

Merge branch 'cycles_memory_experiments' into gooseberry

Conflicts:
intern/cycles/blender/blender_object.cpp
intern/cycles/blender/blender_sync.h

Gooseberry: Fix compilation error with strict compiler flags

Yet another weekly issue squashed, player did not display indicator with
image sequences.

Simple matter of storing the frame for image sequences too.

Sort files in collapsed sequences by frame number.

Now getting an "animation" preview should be pretty easy.

Cycles: Merge density and color volume attributes if they both requested

This way we store quite reasonable amount of memory (density is stored as RGBA
textures, which ends up in gigabytes of RAM for hires smoke sims).

It's not really pretty implementation and we'll really need to support textures
with 1 and 3 channels instead of doing such packing, but we need to be able to
render some files here.

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