Blender Git Loki

Merge branch 'undo-experiments' into undo-experiments-swap-reread-datablocks

Fix previous commit.

undoexp: Update for new 'ID memaddress unique' feature.

Merge branch 'undo-experiments' into undo-experiments-swap-reread-datablocks

undoexp: Update for 'unique ID memaddress' change.

Merge branch 'id-ensure-unique-memory-address' into undo-experiments

Initial rough idea of 'unique ID address' change.

Goal of this code is to ensure we only ever use a given memory address
once, for all IDs generated in a bmain.

This is crucial if we want to be able to use ID pointers instead of ID
names in undo speedup work, when re-using existing IDs.

GPencil: Refactor: Fix blend modes broken

GPencil: Refactor: Add per mask inversion capability

With this commit, masks can be inverted per layer. Inversion means the
mask becomes subtractive instead of additive. The base visibility does not
change depending on the first type (i.e: if ther is nothing in the mask
layer, nothing will be masked regardless of the mask type).

GPencil: Change Stroke Order tooltip

GPencil: Reset Mask list index when remove first element

GPencil: Replace Add mask with popover menu

Also removed iinternal property used.

Merge branch 'greasepencil-object' into greasepencil-refactor

Conflicts:
source/blender/draw/engines/gpencil/gpencil_engine.h
source/blender/draw/engines/overlay/overlay_extra.c
source/blender/draw/intern/draw_manager_exec.c

Merge branch 'master' into greasepencil-object

Merge remote-tracking branch 'origin/master' into experimental-build

Revert "Code quality: Enable SortedIncludes (work in progress)"

This reverts commit 0590bff3abc2d8af2de6cb07b0471114892bfa51.

Revert "SortedIncludes: Fix Mac build"

This reverts commit acfce155e7cb8e470321712debc375eb7334f947.

GPencil: Change icons for Invert Mask: ON/OFF

GPencil: Implement Stroke Hardeness

Still pending the aspect ratio

SortedIncludes: Fix Mac build