Blender Git Loki

quite warning

Very basic random distribution of render hairs.

Render hairs are grouped around a simulated hair in some way. Currently
this is a plain -1..1 box, but should probably be a
gaussian distribution.

Buffered render hair drawing.

Currently all render hairs are drawn in the same place as the simulation
hair. OpenGL buffers are used for efficiency, which gives decent
performance even for many render hairs.

"Render" draw mode for hair, currently just drawing the coordinate
frames.

The average hair segment rest length is now calculated in advance in the
DNA data, so the drawing/rendering can use it for smoothing as well.

more density in emitter, unused function declaration removed

Cleanup of gcc warnings.

Fix compilation after merge.

Merge branch 'master' into soc-2014-shapekey

Conflicts:
source/blender/editors/object/object_shapekey.c

Intensity and color are now adjusted upon import to get correct values

Added regular display options for hair systems.

Only has a mode setting so far, which defines the overall style of
display.

force fields direction correct

UV Edit Selection Propagation

Side By Side Stereo Output mode + small cleanups

Interlace Output Stereo Modes

method to compute sampling distance functions

more fluid_3d pointers handling

FLUID3D pointers handling

Revert "Hair System test."

This reverts commit b4a64930fd2795d923475e4f14ed33f033abdd5f.

Merge branch 'master' into temp_custom_loop_normals

Various optimizations and fixes to `mesh_normals_loop_custom_set()`.

Among other things, weighting (interpolation) of custom normal in vertex case
was broken (interpolated several times).