Blender Git Commits

cleanup make all the "MV" todo notes into "XXX MV" for quick reference later

Cleanup: remove warnings, remove duplicated code, fix util function

(and force the material thumbnail preview to be monoscopic)

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

Conflicts:
source/blender/blenkernel/BKE_scene.h
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/versioning_270.c

Fixed hair velocity smoothing.

This is an important hair interaction feature that simulates friction
between hairs in an efficient way. The method is based on the paper
"Volumetric Methods for Simulation and Rendering of Hair"
( http://graphics.pixar.com/library/Hair/paper.pdf )

It was partially implemented already, but didn't work in this simplified
version. The same voxel structure can be used for implemeting repelling
forces on hair based on density, which can help a hair system maintain
volume instead of collapsing in on itself.

Support for various data properties of the hair grid in the voxel
texture.

Fixed voxel grid initialization from hair points and colliders by using
the suggested tent function from the original paper.

Plain float->int conversion for the grid location otherwise leads to
skewed data and unnecessary loss of information.

New voxel texture mode "Hair", for displaying the internal hair volume
structure as a texture.

This is mostly a debugging feature that may be removed again later.

Code cleanup: Use a variable-sized array for the hair volume velocity
smoothing and collision code, split into multiple functions.

First test with applymodifier.
The modifier has a lot of bugs.

New Stereo Output option: Squeezed Frame

So now top-bottom and side-by-side can be saved as squeezed (default) or unqueezed (old).

Revert "Multiview squash - compositor good for heavy testing"

This reverts commit 6e825f20ec2a4d829788f85d13fd34892f999f3a.

Multiview squash - compositor good for heavy testing

Merge branch 'master' into testbuild

Merge branch 'master' into testbuild

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

Revert "Merge branch 'hair_system_squash' into testbuild"

This reverts commit 381b87312254b8512a594a38ed9d83401bef4d7f, reversing
changes made to 3af6c89e6e1803b4c9c8ab73497933d89dc7bd77.

Revert "soc-2014-nurbs squash"

This reverts commit 377c3cb6b5f6f7807e6896b1bacab6b368d402a0.

Fix T41590: When scene scale is not 1.0, and units are "None," Blender assumes translations are in meters.

Turned out there were several issues in handling of scale parameter by numinput.
Fixed that by factorizing more some code in common with 'usual' numbuttons eval code
(new `bUnit_getScaleUnit()` helper will return valid scaled value, depending on
given system and type).

Now, numinput behaves as expected - using default unit amended by scale in case no unit is given
(i.e. entering '20' with a scale of 0.01 will give you 20cm, and '20cm' as well!).

crash fix when loading blend (due to new autohide option)

Compositor: Image Node to work correctly with MultiView images

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