Blender Git Loki

Merge branch 'master' into wiggly-widgets

Conflicts:
source/blender/blenkernel/BKE_blender_version.h

Added selection field to the Disney BSDF node for switching between
"Multiscatter GGX" and "GGX"

In the "GGX" mode there is an additional parameter for changing the
refraction roughness for materials with smooth surfaces and rough interns
(e.g. honey). With the "Multiscatter GGX" this effect can't be produced at
the moment and so here will be no separation of the two roughness values.

Merge branch 'master' into viewport_bvh_select

Merge branch 'master' into asset-engine

enabled liquid high resolution mode in ui

pointcache adaptions for liquid high resolution files

Merge branch 'master' into asset-engine

Forgot to 'backport' those fixes in last commit :/

Merge branch 'master' into asset-engine

Merge branch 'master' into soc-2016-multiview

fix versioning_270.c conflict. Move secondary_clip version below 2.78

Merge branch 'master' into cycles_disney_brdf

Implemented the OSL part of the Disney shader

Claude: Fix asyncio handling!

Turns out using worker thread to run asyncio loop is not working with pillar, this code is totally
not blender-independent and hence cannot safely work in another thread.

So instead using same technique as in AmberAIO - 'stepping' of asyncio loop, instead of blindly
run_forever() and hoping loop will stop some day...

Note that we may rather call e.g. loop.run_later(1e-5, loop.stop), to actually give a bit more
time to the loop... Time will say what's best option here.

Claude: Fix pillar api url to new value.

improved high resolution step for liquids - using phiparts in high res mode as well now

AmberAIO: Fix asyncio loop handling.

Finally found the right way to do this (at least, I think! :P).

Merge branch 'master' into asset-engine

added liquid high res api functions

Wrap uv chart rotation up in a nice utility function

Make inner fit polygon work with aspect ratios != 1