Blender Git Loki

Merge branch 'master' into soc-2017-normal-tools

Conflicts:
source/blender/blenkernel/intern/mesh_evaluate.c
source/blender/bmesh/intern/bmesh_mesh.c

Depsgraph: Wrap all arguments for modifiers relations update into a struct

Merge branch 'blender2.8' into greasepencil-object

Merge branch 'master' into blender2.8

Cleanup: Fix const pointers mess in previous commit.

Merge branch 'master' into blender2.8

Conflicts:
source/blender/bmesh/intern/bmesh_mesh.c

Fix (unreported) meshes changing shading when creating empty clnors data.

When you were using autosmooth to generate some custom normals, and
created empty custom loop normal data, you would go back to an 'all
smooth' shading, cancelling some sharp edges generated by the mesh's
smooth threshold.

Now we will first tag such edges as sharp, such that shading remains the
same. This is not crucial in current master, but it is for clnors
editing gsoc branch!

Cleanup: clnor code: more 'do not use same varname for two different things'.

Fix T54129: Moving keyframes on top of other keyframes, removes both keyframes

Regression caused by earlier commits to improve the automerge behaviour.
In this case, the problems only occurred when moving a selected keyframe
forwards in time to overlap an unselected keyframe.

Fix: Don't ignore duplicate channels when doing border/circle/lasso select

While it is necessary to ignore duplicates when doing Deselect/Column Select
(where double-updates may result in nothing being selected), for borderselect,
not including the duplicates meant that sometimes, nothing would happen
if you were trying to borderselect keyframes originating from hidden channels.

This was first noticed in the greasepencil-object branch, but affects all
animation channel types.

Merge remote-tracking branch 'origin/blender2.8' into temp-drawcontext

GWN: Context: Fix allocation/codestyle and crash on startup.

Merge branch 'master' into blender2.8

Depsgraph: Remove unused argument

Remove old depsgraph from modifiers relations update context

Merge branch 'master' into blender2.8

Depsgraph: Remove unused bmain from modifiers relations update context

Merge remote-tracking branch 'origin/blender2.8' into temp-drawcontext

DRW: Fix selection & cursor autodist not working after rendering.

That was caused by a wrong state initialization. We could remove every call to these if the state was not changed anywhere else (outside of DRW), but this is not the case...

Fix compilation error with legacy depsgraph disabled