Blender Git Loki

LineArt: Floating edge type.

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

Merge branch 'omni-umm' of https://gitlab-master.nvidia.com/omniverse/blender into omniverse

Update addons_contrib in make.bat.

Invoking new update_nv_addons.cmd script in make.bat
to checkout and pull NVIDIA's branch of addons_contrib.
This is currently necessary to always include the latest
UMM addon in the build. This is not an ideal solution
because we pull the latest commits from this branch
on every build, so we need to consider alternatives
to this approach.

Merge branch 'master' into temp_bmesh_multires

GPencil: Check if original Object has materials to append

GPencil: Simplify Poll function

GPencil: Implement Merge by Distance for curves

This commit adds the `BKE_gpencil_editcurve_merge_distance` function.
It will merge the control points by distance (always at the first point).

Cycles X: tune kernel parameters for RTX cards

As the kernel keeps changing the optimal values will change as well, so this
will need to be revisited when more work is done. And every kernel probably
has a different optimal value. But this is an easy step in the right direction.

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

Fix Cycles X crash using a BSDF in a light shader

* Move BSDF feature test so the right offset is applied
* Exclude BSDFs from volume shaders, and volumes from surface shaders,
to prevent a similar issues.

It would be most efficient to exclude BSDFs entirely from light shaders, but
this is difficult since Cycles does not make a distinction. A shader can be used
by both a Mesh and Light and is compiled only once. We do make a distinction
between surface/volume/displacement shaders, so for that case we can ignore
the node during shader compilation.

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

Merge branch 'master' into temp-gpencil-bezier-stroke-type

Fix kernel loading time accounted twice in render progress

The render session is keeping track of the scene update, which includes
kernel loading time.

This fixes negative render times reported when CUDA kernels are compiled
at runtime.

A bit fragile logic, can be re-implemented using some user-counted
scope utility classes, so that only outer-most time skip is applied.

Cycles: Report device compute type to the full log

Makes it more explicitly visible whether rendering was done on CUDA
or OptiX.

Before this change one had to carefully look at the device ID, and the
look of OptiX device IDs was a bit confusing (mentioning both CUDA and
OPTIX in the ID).

Merge branch 'omni-umm' of https://gitlab-master.nvidia.com/omniverse/blender into omniverse

USD IO: MDL options for UMM.

Added logic to conditionally display MDL
import/export options depending on whether or
not the UMM addon Python module can be loaded.
Also, renamed the Convert Cycles Node Graph
import option to Convert to USD Preview Surface.

USD IO: USD_umm_module_loaded() function.

Added function to determine if the Universal Material Mapping
(UMM) addon Python module was loaded successfully. Also
added conditional compilation directives when WITH_PYTHON
is defined.

GPencil: New operator to Append materials into new object

This is a production request to be able to append all materials of one object into another object.

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

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

Merge branch 'master' into temp-gpencil-bezier-stroke-type

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