Blender Git Loki

Merge branch 'blender2.8' into temp-workspace_mode

Cleanup: Encapsulate primitive creation data into struct, remove unused argument

Should make it easier to add new and modify existing parameters.

Fix manipulators not updating when changing workspace view-layer

There are more issues when changing view-layer (esp. with edit-mode).

Fix merge error in brackets

Merge branch 'blender2.8' into greasepencil-object

Conflicts:
source/blender/blenloader/intern/versioning_280.c

Task scheduler: Clarify why do we need an atomic add of 0

Sub-mode for groom editing, for editing different parts of the topology.

Collection: Name collection based on parent's name

So they are:

House
-> House 1
-> House 2
-> ...

The exception is when the parent collection is the master collection. In this case we get:

Master Collection
-> Collection 1
-> Collection 2
-> ...

This is part of "T53495: View layer and collection editing - Design Task"

Revert unused displist changes.

Subsurf: Avoid possible use of partially initialized edge hash

Subsurf: Avoid global lock for loops and orig index layers

This is a bit annoying to have per-DM locking, but it's way better (as in, up to
4 times better) for playback speed when having lots of subsurf objects,

Task scheduler: Start with suspended pool to avoid threading overhead on push

The idea is to avoid any threading overhead when we start pushing tasks in a
loop. Similarly to how we do it from the new dependency graph. Gives couple of
percent of speedup here, but also improves scalability.

In object mode just draw simple wires for groom objects for now.

Simple operator for adding a single groom curve in edit mode.

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

Cleanup: Put includes in alphabetical order

Joining GP objects also merges + fixes animation data for the merged datablocks

Cleanup: Make it clearer which datablock/object we're dealing with

* gpd_act -> gpd_dst ("_act" could also mean "active one we're looking at now)
* gpd -> gpd_src (we sometimes refer to "gpd" as the active one we're working on)

T53610: Crash opening file with linked particles

I could done a subversion bump, but I found a safe way to avoid it.
It leads a bit of an ugly code, but once we bump the subversion
next time we can clean it up easily.

Fix parameter list after merge