Blender Git Loki

Merge branch 'master' into asset-engine

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

Cycles: Temporarily add old kernel for comparison

Merge branch 'master' into soc-2016-cycles_denoising

Worked on HiZRaytracing

Cycles: Replace object index hack with actual checks for SD_TRANSFORM_APPLIED

Using ones complement for detecting if transform has been applied was confusing
and led to several bugs. With this proper checks are made. Also added a few
transforms where they were missing, mostly affecting baking and displacement
when `P` is used in the shader (previously `P` was in the wrong space for
these shaders)

Cycles: Fix bump mapping to use object space when used with true displacement

Bump mapping was happening in world space while displacement happens in object
space, causing shading errors when displacement type was used with bump mapping.

To fix this the proper transforms are added to bump nodes. This is only done
for automatic bump mapping however, to avoid visual changes from other uses of
bump mapping. It would be nice to do this for all bump mapping to be consistent
but that will have to wait till we can break compatibility.

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

Got foreground-background colors working with vertex paint.

Cycles: Tweak the reduced feature space calculation

Forgot to update smudge and blur callbacks.

Sped up initial vertex paint click. Something after vertex paint done event is still slow.

Merge branch 'master' into temp-cycles-microdisplacement

2.78 release: Point locales to a proper updated branch

Merge branch 'master' into cycles_disney_brdf

Fresnel in the microfacet multiscatter implementation improved

Merge branch 'master' into wiggly-widgets

Conflicts:
release/scripts/modules/bpy_extras/keyconfig_utils.py
release/scripts/startup/bl_ui/properties_data_bone.py
source/blender/editors/transform/transform_manipulator.c
source/blender/windowmanager/WM_api.h
source/blender/windowmanager/intern/wm_event_system.c
source/blender/windowmanager/intern/wm_operators.c
source/blenderplayer/bad_level_call_stubs/stubs.c

Merge branch 'master' into soc-2016-multiview

Merge branch 'master' into asset-engine

Claude: add Pillar 'login' to Blender CLoud.

Reusing again mostly code from NlenderCloud add-on, adapted to asset engine system...