Blender Git Commits

Merge branch 'master' into greasepencil-object

Merge branch 'master' into greasepencil-edit-curve

Added GLSL tests

Merge branch 'asset-metadata' into asset-browser

Follow up to previous commit, rename asset operator in Outliner

Forgot to rename it in the Outliner as well ("Create Asset"->"Make
Asset").

Merge branch 'master' into uvimage-editor-drawing

Use overlay grid

Merge branch 'master' into greasepencil-object

Merge branch 'master' into greasepencil-edit-curve

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

Quiet a warning in non-debug build.

Merge branch 'master' into newboolean

Moved orientation etc tests into BLI_math_boolean.hh.

These tests are only used by the delaunay, mesh_intersect,
and mesh_boolean files. At the suggestion of Brecht, moving
them into BLI_math_boolean.hh and math_boolean.cc.

Merge branch 'asset-metadata' into asset-browser

Keep assets local to the file, don't copy them

Previously my idea was that when creating an asset for the user
repository, we'd always create a deep copy of the data-block for storage
in the repository.
However for the initial design, we decided to not let Blender
automatically save things into a repository. The user has to mark a
data-block as asset and save the file, so the asset is stored as part of
that file. By adding a path to the Preferences, all .blend files in that
path become part of a repository and users can then access their assets
in different projects through the Asset Browser (not done yet).

Because of this, the operator is now called "Make Asset" again, not
"Create Asset". We don't create a new asset, we just add asset data to
an existing data-block.

Fix face element import: index out of range crash

Merge branch 'master' into uvimage-unavailability-grid

Support dragging assets from Asset Browser into viewport

This should work for objects, groups, materials, images. It can be added
for more data-block types.

The Asset Browser UI code basically forwards some asset information
(like the path) to the general UI code. This can then append the asset's
data-block once dropping it into the viewport.

Merge branch 'master' into uvimage-unavailability-grid

Use overlay grid for unavailable image

Fix build error after merge; add logging.

Fix typo in the {rB0aeb338d1952725cfb8}: really turn off tessellation
this time.