Blender Git Loki

WIP Simulated Annealing

Stubs for storing the best solution and initial scaling of charts

Merge branch 'strand_gpu' into strand_nodes

Fix unfreed memory due to incorrect pointer checks.

Handle replacement of the shader cache for strands outside the creation function.

This makes it easier to run preparation code outside the gpu module conditionally.

Merge branch 'master' into alembic_basic_io

Conflicts:
intern/cycles/blender/blender_mesh.cpp
intern/cycles/blender/blender_sync.h
intern/cycles/render/scene.cpp

Merge branch 'openvdb' into cvdb_ray_isect

Merge branch 'master' into openvdb

Conflicts:
intern/cycles/render/nodes.cpp

Fix playerstubs

Added new node tree type for hair nodes.

fix track correspondence loading issue

fix self correspondence error

a track cannot link to itself

Merge branch 'master' into strand_nodes

Merge branch 'master' into object_nodes

Merge branch 'master' into strand_gpu

Merge branch 'master' into strand_editmode

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

WIP simulated annealing

Implemented local stop condition: start Cooling Schedule if more than local_iter_max (currently 50) "frozen state solutions" occur
Forzen state solution: A packing solution with no significant improvement to the current best solution

Merge branch 'strand_gpu' into strand_nodes

Merge branch 'master' into object_nodes

Merge branch 'master' into strand_gpu