Blender Git Loki

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

Revert "Multiview temp snapshot"

This reverts commit 965ea67e31cb31eb05429fd1b2813166fedacd6a.

Multiview temp snapshot

Revert "Squash hair_immediate_fixes branch."

This reverts commit 6733d31f60493535f33a3133065d07e5415b5653.

Squash hair_immediate_fixes branch.

Merge branch 'master' into testbuild

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!).

soc-2014-nurbs squash

Merge branch 'hair_system_squash' into testbuild

Hair System test.

Revert "Hair System test."

This reverts commit 9fedf885b4e413865250b1673dd31d5ab3896584.

Merge branch 'hair_system_squash' into testbuild

Hair System test.

Revert "Squashed commit of custom split normals branch."

This reverts commit be5ac0929fc1496866aa69c55b18b2f5574b80e0.