Blender Git Loki

Merge branch 'master' into hair_immediate_fixes

Conflicts:
source/blender/blenkernel/intern/implicit.c

Merge branch 'master' into wiggly-widgets

Store the waveforms between undo steps when they exist.

Fix compilation in MacOSX

More undo issue solving.

This commit moves sound loading out of library linking. The approach
chosen here is to do lazy initialization by basically validating the
sound before attaching to the scene.

Loading the sound buffer requires a valid Main pointer, which means we
have to pass this around in many places. We might also consider caching
the waveforms in this way too, but for now we're still using the
threaded update.

We'll have to test this somewhat to see if it behaves well..There are
corner cases which might not be covered. Sounds are muted if we undo
during an animation, but this bug existed in master as well.

Merge branch 'master' into terrible_consequencer

Merge branch 'master' into hair_immediate_fixes

Conflicts:
source/blender/blenloader/intern/versioning_270.c

Clear forces and constraints together at the start of the time step,
easier to verify.

Threaded sound strip display data loading.

Sound loading can take too much so move it to a job and continue. This makes
interaction much better. A similar system should be usable for movie previews.

Fix for missing initialization of local cloth modifier inside particle
systems.

Proper implementation of angular bending springs including jacobian
derivatives for stabilization.

The bending forces are based on a simplified torsion model where each
neighboring point of a vertex creates a force toward a local goal. This
can be extended later by defining the goals in a local curve frame, so
that natural hair shapes other than perfectly straight hair are
supported.

Calculating the jacobians for the bending forces analytically proved
quite difficult and doesn't work yet, so the fallback method for now
is a straightforward finite difference method. This works very well and
is not too costly. Even the original paper ("Artistic Simulation of
Curly Hair") suggests this approach.

Gooseberry request, option to turn all waveform display on/off.

Attempt to fix shader compilation in OSX. strict compilation does not
allow dividing float by integer.

Unused function declaration.

Basic solver result feedback from the mass-spring (cloth/hair) solver.

This returns a general status (success/no-convergence/other) along with
basic statistics (min/max/average) for the error value and the number
of iterations. It allows some general estimation of the simulation
quality and detection of critical settings that could become a problem.
Better visualization and extended feedback can follow later.

Hack to make undo/redo faster in sequencer when using strips with
waveform display.

Basically, we store the waveform. This is not really recommended but
until we have nice threaded creation for the strips that doesn't block
the interface it's a nice solution for gooseverry.

May be wise to limit the undo memory for people who use that because
basically each operation will store a copy of the waveform in the file.

Merge branch 'master' into terrible_consequencer

Calculate bending targets based on the direction of previous segments.

This makes the bending a truely local effect. Eventually target
directions should be based in a local coordinate frame that gets
parallel transported along the curve. This will allow non-straight
rest shapes for hairs as well as supporting twist forces. However,
calculating locally transformed spring forces is more complicated.

Simple debug drawing support inside the implicit solver.

Widgets API.

This commit has first WIP code for widgets API.
Generally widgets should be registered similar to dropboxes, that is,
any code can query for a widgetmap for a certain space and area type
and the window manager will take care of initializing the handlers
automatically.

The owner will be able remove and readd widgets to a certain widgetmap
dynamically. Generally owners should cleanup their widgets though initial code
cleans up leftover widgets automatically.

All this is the theory still, some parts are in that commit, more to come
later, but it's a solid base to build from for an initial commit.