Blender Git Loki

Merge branch 'master' into alembic_basic_io

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

Use #defines for cfr computation and revert to random point sampling for now

Seems like the random approach works better for now (and is bug free), but I keep the code for cfr computation around, will be needed once concave hulls are implemented
This commit also fixes intersections with rotated charts

Merge branch 'master' into soc-2016-pbvh-painting

Conflicts:
source/blender/blenloader/intern/versioning_defaults.c

WIP Collision Free Region computation

trying to shift window for secondary clip

Rollback attempt to fix sss crashing, it prevented crash by disabling sss completely, thus useless

Curves: Trim operator

The trim operator works fine in 1/3 cases.

Add an undef for sc_next for safety

Each node gets expanded to two function calls for autodiff.

The value is calculated without any derivative inputs (this is not a differential equation).
The derivatives in both variables also depend on the partial derivatives of the inputs.

WIP Simulated Annealing

Iterations now only recompute placement of one random chart according to the main reference paper
Also includes stubs for margin computation

Incorporate the generated GLSL code for hair displacement into the strands vertex shader.

Make sure edges are computed.

Emit function calls for each node.

Base functions are yet to be defined.

Support dual values for autodiff'ing in GLSL codegen right from the start.

Note that for the hair displacement function we would only be interested
in a single derivative (the tangent). For now we just use the existing
2-variable duals, later on this can be generalized to avoid unnecessary
and confusing code emission.

Make mesh validation optional.

Add a make local function to CacheFile id block.

Merge branch 'master' into alembic_basic_io

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

Merge branch 'master' into alembic_basic_io

First steps for the GLSL code generator and hair displacement nodes.