Blender Git Loki

Fix multi line comment open tag

Merge remote-tracking branch 'origin/master' into asset-browser-poselib

Merge branch 'master' into cycles-x

Cleanup failed patch reversion

Merge branch 'master' into temp_bmesh_multires

Merge branch 'master' into temp-explicit-colors

Performance: GPU Batch Baseline TestCase.

When using a dense mesh and transforming a small number of verts the mesh received a copy-on-write signal. This will free all GPU batches. No reuse is currently possible.
This patch adds a test case that can be used as a baseline to optimize the cache construction in the draw module.

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

USD Import: don't modify import params.

Fixed the unit conversion code to avoid changing the
import params scale member, to keep the params identical
to what the user specified. Also updated the USDXformReader
logic to use the scale value stored in the settings, to take
into account the unit scale factor.

Fix incorrect output border calculation

Dyntopo now updates the existing pbvh on undo instead of building
a new one from scratch, an operation that can be slow despite being
threaded.

PBVH building is a memory bound operation (not just on the CPU side
either, remember the draw buffers have to be fully regenerated too).
Incrementally updating it this way is enormously faster (about as fast
as non-dyntopo undo).

The downside is we don't have the convienience of users regularly
building the pbvh from scratch anymore. Dyntopo does try to
join empty PBVH nodes (which happens after every stroke), but
that's not a complete substitute for a decent tree balancer.
That's on the todo list.

Tried to make pbvh bmesh normals calc a bit more efficient.

Move customdata wrapper to GHOST_Util.h

Rename "threshold" to "float_threshold"

Use RAII customdata wrapper for ctor exceptions

Fix errors/warnings on Linux, gcc

Use WorkScheduler::finish() for better perfomance

Use getInputOperation instead of socket links

Merge remote-tracking branch 'origin/master' into temp-lineart-contained

fix memory leak

fix missing null pointer check.