Blender Git Loki

Merge remote-tracking branch 'origin/master' into soc-2016-uv_tools

Reworked binary depth search for non fitting charts

This produces much better results now. Still potential for optimization

added normalization for liquid inflow (needed for mantaflow)

made viewport switcher functional. now switching between geometry and render/preview works.

Use a converter class for handling differences between DNA and BMesh strands data.

This moves most of the data access logic for this data out of the GPU code and into
the respective BKE files. The concept is similar to how DerivedMesh is used in other
GPU code.

Copying old wpaints every click is slow in wpaint test start, and only is used to prevent paint overlap. I'm working on doing the same logic using a flag buffer instead, which should speed up the test start. Still need to add blur for multipaint. I accidentally removed the accumulate option, but my blur code does essentially the same thing. Will add average brush, since it's been requested a lot.

Fix for compile error

clean up: bad formatting in pointcache fixed

cleaned up /removed some old TODOs

Merge remote-tracking branch 'origin/master' into soc-2016-uv_tools

Cleanup commit

Deduplication of strand drawing functions.

The two variants for object and edit mode are the same, except for
setting the edit data in the parameters.

Removed deprecated editmode drawing code.

The only real missing feature from this code is drawing points and
selection state, which can be reimplemented quite easily.

renamed viewport mode switcher variables

Changes/bugfixes for NFP reference vertex assignment

This commit makes all of my testcases work!

It also makes the ref vert offset code obsolete, but I'll commit it anyway (commented out) in case I may need it later

New option for selecting a fiber rendering primitive.

Currently lines and ribbons (triangle strips) are supported.
The ribbon width can be controlled with a parameter. Ribbons are
oriented toward the camera, similar to billboards, but shaded like lines
with the Kajiya shader imitating a reflective tube.

Merge branch 'master' into soc-2016-multiview

Merge branch 'master' into soc-2016-multiview

add a new mode in space clip view

Changed weight paint to recycle current colors as previous colors instead of copying every weight every click. Also set openMP flags to true, although I still need to add a checkbox in options to enable multiple threads. Added blur support, but still need to add blur support for multi-paint mode.