Blender Git Loki

Resolve crash when switching to grease pencil object

Modifiers: Add Bone option for Texture Mask Object

This patch adds the option to use an armature bone in place of an object for texture mask coordinates.

This affects the 3 vertex weight modifiers, the displace modifier, the warp modifier, and the wave modifier.

With minor changes from Bastien Montagne (@mont29).

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

Small tweaks to bevel modifier UI

UI: Better support for linked data-blocks in search buttons

In RNA pointer search buttons (i.e. the ones with an eyedropper),
data-blocks were handled badly. It was not possible to select a linked
data-block that had the same name as a local one, which is especially
common with library overrides. Neither was there a hint to tell appart
linked data-blocks and which .blend file they come from.
These issues are addressed now, we show an "L" prefix and the .blend
file name in the search box (like in ID-templates).

Changes here are quite simple, since the heavy lifting was already done
through c20c203b8226.

Addresses T73156.

Merge branch 'modifier-panels-ui' of git.blender.org:blender into modifier-panels-ui

Refactor saving and setting list panel expansion

The public functions are named more sanely and their requirements are
much simpler, with more of the logic handled internally by interface_panel.c.

Also solves a bug saving and loading sub-subpanel expansion.

Alembic: keep references to the schema objects

These references are necessary for Alembic to have proper bookkeeping.
Without them, you get errors that a property `N` already exists when
exporting mesh normals.

Merge branch 'temp-checkbox-layout-tweaks' into modifier-panels-ui

Fix pointer properties breaking column layouts

Merge branch 'master' into temp-checkbox-layout-tweaks

Merge branch 'master' into greasepencil-object

Fix T75489: Crash on deleting current workspace from the outliner

It should not be possible to delete the current workspace from the
outliner. Show an error message instead.

Alembic: fixed time sample test

Resolve const warning for panel data reordering

Tests: On Linux, use Python from install dir

CentOS on the buildbot still runs Python 3.6, which is also used for the
unit tests. This means that the tests can't use language features that
are available to Blender itself. And testing with a different version of
Python than will be used by the actual code seems like a bad idea to me.

This commit tries to find Python in the installation directory, which
will not be there on the first time CMake is run, so it also tries to
find it in the precompiled libraries. If that also fails, it defaults to
whichever Python executable CMake finds.

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

Alembic exporter: unit tests are compiling

Fixed merge error

Fix T74800 Bevel modifier generates vertex group weight > 1.0.

Due to floating point approximations, the weights for interpolating
the mdeformvert layer could add up to a tiny bit more than 1.0.
This was not a problem in practice, but the mesh validation routine
used in regression tests was testing for this and therefore failing.
Just changed interpolation of mdeformverts to clamp max to 1.0f.

Fix T75378: Crash on clicking in the ghost icon of an appended proxy object

Alembic: even nicer subsurf disable method

This is less dependent on the exact implementation of AbstractHierarchyIterator
and also avoids an evaluation of the subsurfs before they are disabled.