Blender Git Loki

fix T50486: Don't always do the `ray_start_correction` in the ortho view

You need to make sure that ray_start is really far away, because even in the Orthografic view, in some cases, the ray can start inside the object

Remove struct `PreDefProject` and store all immutable parameters within the new struct `SnapData`

In order to simplify the reading of these functions, the parameters: `snap_to`, `mval`, `ray_start`, `ray_dir`, `view_proj` and `depth_range` are now stored in the struct `SnapData`

Fix T50550: GPUShader: compile error - Background image not showing in
viewport.

Caused by rBd6cf28c5e15739f864fbf04614c2a50708b4b152, which forgot to
update the GLSL code for the "Light Path" node.

Fix blurry icons

fix D2489: Collada exporter broke edit data when exporting Armature while in Armature edit mode

fix D2489: Collada exporter broke edit data when exporting Armature while in Armature edit mode

Fix (IRC reported) DataTransfer modifier affecting base mesh in some cases.

Checking only whether mverts is same as base mesh one is not enough in
all cases, some modifiers (deform ones) can only generate new mvert
data, while keeping others from original mesh.

Now checking both mvert or medge, hopefully this will be enough to catch
all problematic cases this time.

Thanks @gaia for finding that problem. :)

Fix T50534, Part II: warn user when DataTransfer mod affects custom normals.

Custom normals need Autosmooth setting to be enabled, always!

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)

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

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

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.

CMake: Fix typo

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)

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

Depsgraph: Add placeholder function to handle objects update

This way @dfelinto can do some special trickery in there.

Merge branch 'master' into blender2.8