Blender Git Loki

Avoid empty panel bl_label

And remove unused operator execution context change.

Tiny layout improvements

* Moved Anisotropic Filter setting to the Textures panel (it?s a
texture setting after all)
* Very minor change to Textures panel ordering
* Moved Text panel higher in the list - rather than being at the bottom
it?s not below the Display panel which makes more sense

Fix: Cramped layout in object parent properties

Merge branch 'master' into userpref_redesign

Cleanup: remove non-existing function declarations

Merge branch 'master' into greasepencil-object

GP: Mew Merge Strokes operator

This operator allows to create a new stroke joining several selected points of different strokes.

The new stroke will use the current material.

To use, first select the points to be merged. Optionally can remove the old points and strokes.

The operator is available in Edit mode in the Specials menu and Stroke menu.

Merge branch 'master' into greasepencil-object

Fix invisible scrollbars in Preferences

Need to force correct updates of action-zone alphas for dynamically
sized regions.

Cleanup: warnings (clang)

Fixed intersection missings when bounding area separation occurs.

expose shard neighbors via RNA

Fix responsive Preference layout ignoring hiDPI

Merge branch 'master' into userpref_redesign

Fix: Scrolling Preferences could cause blank UI

Steps to reproduce were:
* Open Preferences
* Choose "Input" category
* Scroll to the bottom
* Choose "Interface" category

The newly activated category should now use the scrolling set previously
in the other category, causing the contents to be out of view. You
would have to scroll to bring it back.

Now scrolling is stored per category.

Fix merge errors and whitespace cleanup

Fix T59675: Motion path frame numbers at wrong positions

Reviewed By: brecht

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

Fix "Show Preferences" shortcut not working

Was broken in 2.7 keymap.

Also whitespace cleanup.

Avoid panel content margins in small regions

Don't see a need for changes in the layout system here, a simple trick
like I've done here is sufficient.
Also: Some refactoring of the `PreferencePanel` class.

Fixed hidden multi-thread error.