Blender Git Loki

Added an additional normal for the clearcoat

With this normal one can simulate a thin layer of clearcoat by applying a
smoother normal map than the original to this input

Merge branch 'master' into soc-2016-multiview

solve conflict

daily commit before rebase

finish link two correspondence together

add link and unlink button in scripts for python

add two correspondence operators

users can specify correspondence in tracking mode
placeholder for now, unfinished

Switched to the improved subsurface scattering from Christensen and
Burley

Camera reader: avoid reading props twice, fix for zero'd clip start.

De-duplicate matrix reading code.

Added Disney Sheen shader as a preparation to get to a BSSRDF

Fix camera reader not using the right time for sampling.

Merge branch 'master' into alembic_basic_io

Setting up transform hierarchy for animated data somewhat works.

There is still some work to be done as in some cases the transform
appears to be mirrored. Though most test files seem to be imported
correctly.

Merge branch 'cycles_disney_brdf' of git.blender.org:blender into cycles_disney_brdf

Conflicts:
intern/cycles/kernel/closure/bsdf_disney_clearcoat.h
intern/cycles/kernel/closure/bsdf_disney_diffuse.h
intern/cycles/kernel/closure/bsdf_disney_specular.h
intern/cycles/kernel/closure/bsdf_util.h
intern/cycles/kernel/osl/CMakeLists.txt
intern/cycles/kernel/osl/bsdf_disney_clearcoat.cpp
intern/cycles/kernel/osl/bsdf_disney_diffuse.cpp
intern/cycles/kernel/osl/bsdf_disney_specular.cpp
intern/cycles/kernel/osl/osl_closures.h
intern/cycles/kernel/shaders/node_disney_bsdf.osl
intern/cycles/render/nodes.cpp
intern/cycles/render/nodes.h

Remove debug print.

Fix missing depsgraph update of new constraint.

Only covers old depsgraph for now.

Move addition of constraint to object class.

Avoid adding modifiers when the data is constant.

memory cleanup for liquid inflow