Blender Git Loki

BLI: Correct spin lock definition

The MSVC atomic function is defined for an unsigned type.

Not sure why this became an issue after switch to TBB by default,
maybe some CFLAGS changed to be more strict after that.

Property Search: Support labels and array buttons

LineArt: Replace Loop by LISTBASE_FOREACH

Fix: remove accidental code

`v1` and `v2` are already set.

Make deps: Use own nasm for ffmpeg and x264

Fixes the warning: building for macOS, but linking in object file

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

Make deps: Compile own version of nasm for Apple

The upstream version of nasm does not put version information to the
generated object files, which makes linker to show the following
warning:

building for macOS, but linking in object file

Using own patched version of nasm which puts required information to
the object file, making linker happy.

The plan is to either streamline the patch and provide it to the
upstream, or, it that takes too long, get an independent fix from the
upstream.

Merge branch 'master' into temp-gpencil-mat-masking

Fix T77455: Blender Freezes when using the 3d Scale Gizmo

Issue is reported on Linux ith Intel HD6xx iGPU. Inside
`gpu_select_sample_query.c` the call to `glGetQueryObjectuiv` froze. After
bisecting this lead to the polyline shader. When using a 3d color shader
in stead of the polyline shader during selection seems to fix the issue.

Other parts of blender might also be effective, but I wasn't able to
freeze blender in these areas. When it does, we might want to add
a similar work-around to button2d, cage2d, cage3d & move3d, navigate.

Backport this patch to 2.83.

Reviewed By: Cl�ment Foucault

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

Merge branch 'master' into greasepencil-edit-curve

Merge branch 'master' into greasepencil-object

Merge branch 'master' into lanpr-under-gp

Merge branch 'master' into lanpr-under-gp

LineArt: Fix compiler errors and warnings in Windows

Merge branch 'master' into property-search-ui

BLI: Fix mistake in SpinLock TBB migration

Copy-paste mistake.

Optimization: use `BLI_bvhtree_intersect_plane` to detect faces that will be affected by the knife tool

The knife code currently calls the `BLI_bvhtree_overlap` function that
tests the overlap between the mesh tree and an AABB that encompasses the
points projected in the clip_start, clip_end and or clip_planes of the
view.

This resulted in many false positives since the AABB is very large.
Often all the triangles "overlapped".

The solution was to create a new function that actually tests the
intersection of AABB with a plane.

Even not considering the clip_planes of the view, this solution is more
appropriate than using overlap.

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

Fix T78307 UI: Drawing artifacts in the Blender UI on macOS

This was due to a bad driver which was not respecting this bit of the
specification:

`If the current primitive does not originate from an instanced draw command, the value of gl_InstanceID is zero.`

Cycles: Add support for native OptiX curve primitive

This patch adds support for the curve primitive from OptiX to Cycles. It's currently hidden
behind a debug option, since there can be some slight rendering differences still (because no
backface culling is performed and something seems off with endcaps). The curve primitive
was added with the OptiX 7.1 SDK and requires a r450 driver or newer, so this also updates
the codebase to be able to build with the new SDK.

Reviewed By: brecht

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

GPencil: Adapt select operators to curve edit mode

All select operators now check if curve edit mode is active. These include GPENCIL_OT_select, GPENCIL_OT_select_all, GPENCIL_OT_select_circle, GPENCIL_OT_select_box, GPENCIL_OT_select_lasso, GPENCIL_OT_select_linked, GPENCIL_OT_select_grouped, GPENCIL_OT_select_more, GPENCIL_OT_select_less, GPENCIL_OT_select_first, GPENCIL_OT_select_last, GPENCIL_OT_select_alternate and GPENCIL_OT_select_vertex_color

LineArt: Handle accidental scene->master_collection == NULL situation.