Blender Git Commits

fix checking SC_VIEW_CLIP error

- should check sc->view rather than sc->mode
- de-duplicate counting tracking code, by making it get_single_track

removed old liquid files (not needed anymore)

Improvement of the SSS in the Disney shader

* Now the bump normal is correctly used for the SSS.
* SSS in Disney uses the Disney diffuse shader

Better calculation of the Disney diffuse part

Now the values for NdotL und NdotV are clamped to 0.0f for a better look
when using normal maps

fix trivial code format

Margin computation

Still need to quickly refactor PConvexHull to actually use margins

check witness_clip->mode == SC_VIEW_CLIP

otherwise the multiview mode has problem in 'Motion Tracking' layout,
since dopsheet and graph are also counte when iterating through clips.

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

Render API/Cycles: Add separate "keep highlights" parameter to the end_result function to fix Save Buffers with Denoising

Curves: Offset operator

small enhancement for voronoi + bisect and solidify after FM use case

if you use voronoi+bisect and solidify after FM, you can automerge now without having autohideable inner faces. This should have the same effect as autohide in regular use case has.

renamed some tabs to match other 'fluid' tabs

Merge branch 'asset-engine' into asset-experiments

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

Merge branch 'master' into soc-2016-multiview

Changed most of ID_IS_LINKED_foo checks as needed.

Basically, due to new 'virtual' libraries & 'path' assets, we consider those 'virtualmy linked' IDs as:
* Local for editing purpose (i.e. they are editable).
* Linked for datablock management purposes (i.e. they can be made local, etc.).

Note: all this is more like a quick hack to test 'file-based' asset repositories (like cloud)
in comming weeks. I really do not think we should use that in the end, an full-featured
'overriding ID' system (as proposed in replacement of proxies for 2.8) would be much saner imho.

Merge branch 'master' into asset-engine

Now one can disable specular reflactions again by setting specular and
metallic to 0 (cracked this in the previous commit)

fixed the Disney SSS and cleaned the initialization of the Disney shaders

fixed an error that was caused by the missing LABEL_REFLECT in the Disney
diffuse shader

And a quick fix for last commit.

Reminder for myself to double check before commiting!