Blender Git Loki

Merge branch 'master' into temp-gpencil-mat-masking

LineArt: Include Depsgraph mode to grease pencil modifiers callback

Cleanup: use doxy comments

UI: add merge/split menus

This makes the menus and keymap match the edit-mesh
(M for merge, Alt-M for split).

Make deps: Fixes for macOS platform

Set of fixes which had to be made in order to have dependencies built
on own laptop:

- Require bison as a dependent software. It is required by ISPC.

On macOS it is required to be installed via Homebrew. This is because
Bison from Xcode toolchain is too old.

- Made sure Boost is compiled using clang.

Without this gcc was used, and some unsupported command line argument
was passed to it.

- Modify OGG in a way which does in fact pull fixed sized types.
They are defined in stdint.h.

Without this fix FFmpeg will not detect presence of OGG because the
test program fails to compile.

- Force disable zstd compression and make wepb optional for the TIFF
library. Without this TIFF might pick up development libraries from
Homebrew.

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

Fix sign conversion error

LineArt: Making settings panel visible in all engines.

Cleanup: remove unused arguments

LineArt: Don't create frames in gpencil modifier.

Merge remote-tracking branch 'origin/master' into lanpr-under-gp

Cleanup: spelling

Cleanup: unused World struct members linfac, logfac

Outliner: Add sort by object type

When sorting by type, collections are sorted alphabetically. Objects are
sorted by their types.

Outliner: Sort collection and object names

Refactor the sorting code to apply to collections and objects, but keep
the order between objects and collections separate for now.

Outliner: Add sort method enum

Replace the SO_SKIP_SORT_ALPHA with an enum of multiple sort types. The
types are manual, alphabetical, type, and creation order. Only
alphabetical works.

Fix build error with tests for removed functions

These GHash functions were removed in 12817083ec61,
so the tests should be removed too.

Cleanup: Use bool instead of int

UI: Add shortcuts for shader effect panels

Only the delete shortcut applies here, although the move up and down
operators can optionally be assigned in the keymap.

See rB1fa40c9f8a81 for more details and rB5d2005cbb54b for the
grease pencil modifier panel implementation, which is the same.

Merge branch 'master' into soc-2020-outliner

Merge branch 'master' into temp-gpencil-mat-masking