Blender Git Loki

Merge branch 'soc-2020-testing-frameworks' of git.blender.org:blender into soc-2020-testing-frameworks

Fix for T75369: Text Editor Line Color

Use correct text color when syntax highlighting is off but line numbers are on.

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

Reviewed by Hans Goudey

Merge branch 'master' into soc-2021-testing-frameworks

Merge branch 'master' into greasepencil-object

Merge branch 'master' into greasepencil-edit-curve

UI: Do Not Display Negative Zero Floats

Display negative zero floats as regular zero. Does not alter underlying value.

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

Reviewed by Brecht Van Lommel

Cleanup: clang-format

cleanup: Fix style issue in sculpt.c

At first sight this code should not build at all
but due to the use of macro's that look like functions
this seemingly has no issues building.

Clang-format alerted me to this strange bit of code
by placing the `if` on it's own line for some reason.

added the missing brackets, and clang-format is happy
again.

Change cmake configs for full and release to enable WITH_GMP.

Cleanup: Fix build error with msvc

`ssize_t` is not a standardized type (it's a posix type)
given the line in question here is calculating the size
of a memory allocation there's no logical way this
should ever be negative.

I do not know this code too well and was unsure if
`mdverts->totweight` could ever be < 0, so I protected
it with a clamp, just in case.

Fix to previous commit to allow building without WITH_GMP.

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 newboolean branch into master.

This is for design task T67744, Boolean Redesign.
It adds a choice of solver to the Boolean modifier and the
Intersect (Boolean) and Intersect (Knife) tools.
The 'Fast' choice is the current Bmesh boolean.
The new 'Exact' choice is a more advanced algorithm that supports
overlapping geometry and uses more robust calculations, but is
slower than the Fast choice.
The default with this commit is set to 'Exact'. We can decide before
the 2.91 release whether or not this is the right choice, but this
choice now will get us more testing and feedback on the new code.

Merge branch 'blender-v2.90-release' into master

Blenloader: add api function for accessing packedfile address map

This is needed to move direct_link_packedfile out of readfile.c for T76372.

Merge branch 'master' into uvimage-editor-drawing

Use overlay grid

Merge branch 'master' into greasepencil-object