Blender Git Commits

GPencil: Don't add mask layers to mask list

This avoid cyclic relations

GPencil: Back Mask Switch to 2 modes: ON/OFF

GPencil: New list of Masking Layers

This replaces the old unique layer for masking with a full list.

GPencil: Fix missing eyedropper options in toolbar

Merge branch 'greasepencil-object' into greasepencil-refactor

Merge branch 'master' into greasepencil-object

GPencil: Rename masking layer references when rename mask layer

GPencil: Use new BKE_gpencil_layer_named_get() instead of generic BLI

GPencil: Fix compiler warnings

GPencil: Refactor: Fix display bug of strokes endpoints

GPencil: Refactor: New linked mask system

The new system is more flexible and a bit simpler from the code side.

Each layer has a mask layer slot. If filled with a correct layer name,
the mask layer will be rendered again in a separate buffer. This buffer
will then be used in the blend pass to modulate the opacity of the layer.

This approach is not 100% equivalent to the standard layering in most 2D
applications if using varying alpha on a mask applied to multiple layers.
However this technique does support any ordering arrangement of the masks.

The layers used as mask can now still render normaly.

Merge branch 'greasepencil-object' into greasepencil-refactor

Merge branch 'master' into greasepencil-object

Cleanup: Animation, removed impossible-to-reach code

While fixing T39207 @aligorith added a threshold to the binary search
function that's used to find the closest keyframe. Since that threshold
is larger than the threshold used in the now-removed code, the condition
in that code will evaluate to true anyway, and thus it can be removed.

Cleanup: Animation, simplified fcurve_eval_between_keyframes() code

The function now immediately returns the evaluated value, rather than
setting a variable's value and returning that at the end of the
function. As a result, `else`-clauses and `break` statements could be
removed, simplifying and unindenting the code.

Declarations of some variables that are only used in a specific part of
the function have been moved there to clarify and limit their scope.

No functional changes.

Cleanup: Animation, split fcurve_eval_keyframes() into separate functions

There are three main parts of the `fcurve_eval_keyframes()` function:

- before or on the first keyframe
- after or on the last keyframe
- between those points

These are now separated into separate functions. Apart from moving the
code, there are minimal code/cleanup changes. More cleanups to follow.

No functional changes.

Animation: added unittests for FCurve evaluation

I want to clean up some of the FCurve evaluation functions by breaking
them up into smaller parts and simplifying some code paths. Before I do
that, however, I want to add some tests to ensure I don't mess up too
much.

GPencil: Rename collision to boundbox

The initial use of the variables was collision, but now are used for more things, so it's better put a more general name.

GPencil: Fix merge errors

Also, the modiifer reuse precalculated bounding box data.

Merge branch 'greasepencil-object' into greasepencil-refactor

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