Blender Git Loki

UI changes: renamed modifier label and some preparations for liquid high res mode

Merge branch 'master' into asset-engine

Depsgraph: Use new layer based iterator

Support for early-breaking iterator was needed here, which I had to add in a rather ugly way.

add secondary_clip I/O to writefile and readfile

The ->secondary_clip save/load code basically follows the save pattern
of ->clip. It works but may be incomplete, need to be checked.

comment out iterating code

we don't need to iterate over all open spaceclip to find witness cameras
since we now know where the witness comes from (secondary_clip pointer).
However, the con is that we don't know how to access more than one
witness camera. Need to fix this later.

Merge branch 'master' into asset-engine

Merge branch 'master' into soc-2016-layer_manager

Add/use BKE object visibility checks using correct logic

Avoids code duplication and makes handling visibility easier (also for my further layer manager work).

Was a bit afraid of doing this since I wasn't sure if it's possible to handle all cases nicely, but turned out to work quite well and it really improves readability.

Make Cycles work with new local view

Counteract numerical errors in distance constraint evaluation (drift).

With large steps in hair editing strokes the solution to distance-constrained
hair displacement becomes inaccurate, leading to a gradual lengthening of strands.
To counteract this the length constraints can enforce a velocity relative to the
constant target length of each segment. This results in an overall constant
length, even when the constraint solution is inaccurate for nonlinear constraints.

Note that the result would become much better with backward Euler integration,
currently there is a noticable 1-step lag between strokes and the distance fix.

Tentative "stiffness" forces for resisting hair bending.

This is not really nice yet, but just serves as a test for internal forces.

Merge branch 'object_nodes' into strand_nodes

Merge branch 'master' into object_nodes

Merge branch 'master' into strand_nodes

Merge branch 'master' into strand_editmode

fix for outflow: only delete content from cells inside mesh

border collisions now work for smoke AND liquids

Half Floats: Initial support for CUDA.

This is not working yet, due to an error on rendertime, I assume it's an error on reading the texture. If I render a scene, with the half float texture outside of the camera, it works.

* Enable half floats for Kepler cards (1024 for half and 1024 for half4)
* Use proper half data type for CUDA, don't declare our own.
* Change __float2half_rn to __float2half, which should be the same according to http://stackoverflow.com/questions/35198856/half-precision-difference-between-float2half-vs-float2half-rn

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

Merge branch 'master' into temp_localview_split