Blender Git Loki

Show multiview option for OpenEXR formats

Merge remote-tracking branch 'origin/master' into multiview

Reduced the length threshold for disabling short hairs from 0.1 to 0.01.

Fix for rB71271bb, was replacing the force vectors entirely instead of
adding.

Fix for effector force fields on hair, using the world-to-root
transformation.

Add weak repulsion forces to hair collision response to keep the hair
at a the margin distance ("outer" softbody margin).

This has to be clamped arbitrarily unfortunately, otherwise the
repulsion force can add too much energy into the system. A factor of
4 * restitution impulse seems to give good results for now, this can
be refined later on if necessary.

Merge branch 'master' into soc-2014-viewport_context

fix issue with scons

Added back the velocity smoothing implementation.

This is now also decoupled from the internal solver data. The grid is
created as an opaque structure, filled with vertex or collider data
(todo), and then forces can be calculated by interpolating the grid at
random locations. These forces and derivatives are then fed into the
solver.

WIP, beginning of renderer system that should take care of sorting
materials properly for rendering.

-Need to check aspect system first before going too much into this-

Hook up flags to request a specific sorting scheme from GPU buffer setup
routines. (still inactive
)

Fix for Sintel hair bug.

The hair solver needs sane input to converge within reasonable time
steps. In particular the spring lengths must not be too difference
(factor 0.01..100 or so max, this is comparable to rigid body simulation
of vastly different masses, which is also unstable).

The basic hair system generate strands with equally spaced points, which
is good solver material. However, the hair edit operators, specifically
the cutting tool, can move points along the strands, creating tightly
packed hair points. This puts the solver under enormous stress and
causes the "explosions" observed already during the Sintel project.

The simple solution for now is to exclude very short hairs from the
simulation. Later the cutting tool should be modified such that it
keeps the segments roughly at the same length and throws away vertices
when the hair gets too short (same goes for the extension tool).

The hair system should have a general mechanism for making sure that
situations such as this don't occur. This will have to be a design
consideration for replacements in any future hair system.

Fix issue with sculpting and SSAO.

We need to enable stenciling on the compositing FBO or we can clear
areas we don't want to clear and cause invalid depth values.

Restore texture coordinates properly

Merge branch 'master' into viewport_experiments

Merge remote-tracking branch 'blender-upstream/master' into blender-tiles

Conflicts:
source/blender/compositor/intern/COM_MemoryBuffer.cpp

Fix for flickering, recreate the framebuffer textures in that case
(looks like it's the only way to have matching per pixel results too)

Move GPU compositing to its own file.

Also avoid recreating the framebuffers and gpu/color textures each
frame.

Happiness :)

There are still some glithes when scaling the areas, I'll look at those
next.

Minor fix when gravity code is disabled.

SSAO

* Expose attenuation value - allows to change influence of far objects
* Change influence of far objects to quadratic, eliminates some extreme
fringing from far occluding surfaces.