Blender Git Loki

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

# Conflicts:
# source/blender/blenkernel/intern/scene.c

Merge branch 'master' into greasepencil-object

Fix T80899: Crash on editing multiple UVs of multiple different objects at the same time

The issue was two fold.

First something sets the loop element tag and doesn't clear it before
the UV code in question tries to use the tags. Added a sanity clear to
make sure that it operates on a clean tag state.

The next one was that the UV maps in question had quite a few points
that had zero length UV loop edges. This would lead to division by
zero.

Reviewed By: Jeroen Bakker, Brecht

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

Fix T80899: Crash on editing multiple UVs of multiple different objects at the same time

The issue was two fold.

First something sets the loop element tag and doesn't clear it before
the UV code in question tries to use the tags. Added a sanity clear to
make sure that it operates on a clean tag state.

The next one was that the UV maps in question had quite a few points
that had zero length UV loop edges. This would lead to division by
zero.

Reviewed By: Jeroen Bakker, Brecht

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

Merge branch 'master' into greasepencil-edit-curve

Various fixes in UI messages.

Along some other typos in comments or variable names.

Cleanup (UI): Early-exit rather than having a big-ish conditional body

It's generally considered a better codestyle to check conditions early
and exit early when they are not met, over having most logic of a
function within a big `if`-block. Otherwise people have to go over the
entire block to see if there's possibly an `else` somewhere, or any
followup logic.

Fix T80854: Search buttons fail in Adjust Last Operation Panel

There's the old and ugly hack where the `uiBut.poin` points to the
button itself. When reallocating the button we have to update that
pointer of course.

Cleanup: move some paint helpers to ED_ 'namespace'.

Those two functions had `BKE_` prefix, were defined in BKE headers, but
implemented in ED code, yuck.

Moved everything to ED area for now, since those do not look fondamental
enough to belong to BKE, and none of their usages requires it currently.

Fix T79373: Forbid painting on linked image from 3DView.

As noted by @lichtwerk (thanks), one can have a local object and/or
material using a linked image data-block, this case needs some different
handling to prevent painting on such linked image.

For now, tweak `BKE_paint_proj_mesh_data_check` (eeeek, that name
prefix!) to consider paintslots with linked image as 'non-existing'.

avoid overloading Node::set for array<Shader *>

Add missing new liboverride option to py-defined collections props doc.

Cleanup: Remove unneeded headers.

No functional change.

Merge branch 'master' into soc-2020-io-performance

Cleanup: Remove weird assert in button handling

The function this was in already checks the conditions under which it
can operate (as it should). No need to force the caller to do these
(quite specific) checks, the function can just do nothing if the button
doesn't need these operations.
Otherwise we'd have to always execute these checks before calling, which
makes calling it a hassle, makes the code harder to follow and generally
harder to maintain (what if the conditions change?).

Fix assert failure when using Ctrl+Mousewheel on Object Mode button

Do a proper check to see if the button supports Ctrl+Mousewheel cycling.

See T80659.

include render/shader instead of overloading Node::set

Fix datatoc_icon linker errors with ASan enabled.

Error introduced in {rBf9fcb25d521d}.

Reviewed By: brecht

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

Cleanup: clang format.

Add emission strength to MTL importer.

Ref rBAec4ad081e564