Blender Git Loki

GPU: avoid redundant logic for non-spot lamps

Fix for non spot lamps calculating spot values

Logical error in D1378, also incorrectly used lamp type as a flag.

Include requests' cacert.pem file

This allows us to verify certificates of HTTPS connections, which is
mandatory for logins like on Blender ID.

Reviewers: campbellbarton

Differential Revision: https://developer.blender.org/D1845

Fix T47670: cycles GLSL incorrect normal map node.

Fix T47670: cycles GLSL incorrect layer weight / fresnel.

World space and view space normals were mixed up, we should only convert from
world to view space if a custom normal is connected, otherwise it is already in
view space.

Only insert functions into the function cache when use_cache argument is true.

Type generation for LLVM based on node socket types.

Currently every socket stores a complete and unique type definition.
This should be changed to module-level type declarations and referencing by name.

Implement bvm internal function caching and spin lock (missing from previous commit).

Fix camera focal length widget not reset correctly

Merge branch 'master' of git://git.blender.org/blender

# Conflicts:
# source/blender/gpu/intern/gpu_material.c
# source/blender/gpu/intern/gpu_shader.c

Merge branch 'wiggly-widgets' into temp_widgets_update_tagging

Conflicts:
source/blender/windowmanager/widgets/intern/wm_widgetmap.c

Merge branch 'master' into temp_widgets_update_tagging

Planar Probe, Probe options, Probe Parallax :
- Added Planar Reflections and Refractions:
Rough planar reflection/refraction are roughly approximated by blurring with the microfacet normal direction. We blend to a fallback cubemap for high roughness. They are also displaced using the viewnormals. This last deformation is divided by the distance to the shaded point and multiplied by the distance to the reflection plane to get contact reflections.

- Added options to probes.
Probe can now only render their layers. Diffuse can be disabled (in case of use with a lightmap). Added Operator to manualy update probes.

- Probe parallax:
Correct the rays to project it to the chosen volume (unit cube or sphere) after being corrected by the obj mat (either own or external).

- Probe updates are a bit more consistent.

- Moved PBR light UI from Cycles to Blender sources.

- Added versioning code to update old file with non breaking defaults.

Signed-off-by: Cl�ment Foucault <foucault.clem@gmail.com>

Merge branch 'master' into wiggly-widgets

Cleanup: Variable naming

Use function caching in the same way for BVM as for LLVM.

The previous way of acquiring functions from the cache was actually not threadsafe.
To do this efficiently the cache locking, lookup and potential update is now done
inside the API functions to prevent race conditions on the cache.

removed old manta_pp files from internal python dir - manta_pp files are in intern/mantaflow

Experimental (and very messy) code for JIT compiling and running a simple stub function for texnodes on the LLVM backend.

Merge branch 'master' into asset-engine

Merge branch 'master' into id-remap