Blender Git Loki

Fix T50534: Part I, cleanup loop normals generated during modifier stack evaluation.

Those could stay around, and be displayed in 3DView even when autosmooth
was disabled (but would not be 'active').

UI: Move Scene Game Properties to the Scene Tab (was in world)

Added switch to test viewport cache

Snap Functions: Remove the use of the function 'BLI_bvhtree_find_nearest_to_ray' in transform_snap_object
Although the "BLI_bvhtree_find_nearest_to_ray" function is more practical than the generic "BLI_bvhtree_walk_dfs", it does not work to snap in perspective view. This makes it necessary to add "ifs" and functions that make the code difficult to understand

patch: D2474

Mesh batch caches should not be stored in file

Temporarily prevent crash on edit mode

Cycles: Add option to replace GI with AO approximation after certain amount of bounces

This is a speed up option which is mainly useful for viewport. Gives nice speedup in
the barbershop scene of 2x when replacing GI with AO after 2nd bounce without loosing
too much details.

Reviewers: brecht

Subscribers: eyecandy, venomgfx

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

Merge remote-tracking branch 'origin/render-layers' into clay-engine

Fixup for rBac58a7fa (HSV doversion)

We are not bumping file version, but we cannot have the doversion code running twice.
In this particular case it was crashing files, since we were setting node->storage to NULL, and later on accessing it.

Introduce Dynamic Batches + Relationship lines + Clear some matrix warnings

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

CMake: Fix typo

Merge branch 'render-layers' of git.blender.org:blender into clay-engine

# Conflicts:
# source/blender/makesdna/DNA_scene_types.h

Merge remote-tracking branch 'origin/blender2.8' into render-layers

Note:

renamed blo_do_versions_after_linking_280 to do_versions_after_linking_280 to following the pattern of do_versions_after_linking_270

Mesh batch caches update from depsgraph

We no longer need to rely on Derived mesh flag since the mesh is
properly flushed from the depsgraph

Depsgraph: mesh cache depends needs updates when geometry changes (patch by Sergey Sharybin)

Fix blenderplayer build

Use the ultimate depsgraph callback function

Note: when in edit mode this depsgraph update is not being called. We are using DerivedMesh in those cases, so it is fine. I would like to investigate this though

Fix include compilation error on MSVC 2015.

Fix compilation error on windows