Blender Git Loki

Toolbar: Move Ruler into same group with Annotations (but as separate buttons)

This way, the items group up nicer when you have the 2 column
icon groupings.

Fix T55879: Crash setting render presets

Any RNA using 'rna_SceneCamera_update' crashed when set from Python.

Merge branch 'hair_guides' into tmp_hair_curves

Fix: Pinning GP Object data in Properties Editor wasn't showing the GP Data tab

Reverted T55880 fix by accident

Merge branch 'blender2.8' into hair_guides

Fix T55877: Crash snapping non-edit-mesh to grid

Fix T55880: Crash dragging file into image editor

Caused by b4ccec67429b4

Merge branch 'blender2.8' into greasepencil-object

Fix building & linking on Linux

Merge branch 'master' into blender2.8

Keymap: minor changes for keymap display

Cleanup: Remove GPENCIL_OT_color_choose

This isn't used anywhere, and should really even need to be
used for any purpose.

Annotations: Don't display Annotations properties panel when GP data in context is for GP Object

Fix workspace not freeing tool properties

Transform: default constraint to user orientation

Previously global was always used before the current orientation,
the order is now reversed, which assumes the user wants to first
use the value they set, with the global secondary.

Merge branch 'master' into blender2.8

Fix transform plane constraint orientation cycle

Regression since 2.79b release

Fix: Don't allow Annotation tool to paint on GP Objects and vice versa

Merge branch 'blender2.8' into greasepencil-object