Blender Git Loki

Compositor: Fix crash when connecting multiple constant inputs

Operation receiving inputs was being folded more than once
when it was constant foldable.

Merge branch 'master' into soc-2021-geometry-nodes-regression-test

Addressed comments by Habib

LineArt: Shadow improvements.

MCE: Remove redundant tool: Add_marker_slide

The default tool for tracking mode in the clip editor is
add_marker_tweak. Add_marker_slide is not needed anymore.

Reimplement lines adjacency extraction using existing code.

This fixes X-ray mode.

Masking: Slide origin with draw_mask tool

The mask tool creates a curve point when leftclicking. When clicking
near an existing point it switches to select and move instead. The same
happens now when clicking near the origin point so it is now possible to move the
entire mask again with LMB.
Patch by Sergey, thanks a lot!

MCE: Only show marker settings with active clip

When no clip was loaded, draw the add_marker_tweak tool options gave an
error. So only draw them when a clip is open.

MCE: Change default tool

Use the add_marker_tweak tool in Tracking mode and the draw_mask tool in
Masking by default instead of select_box.
It doesn't yet work for masking when switchin modes with Tab, only when
changing the workspace.

Merge branch 'master' into subdivision_work

Merge branch 'temp-lineart-contained' into lineart-shadow

Merge branch 'master' into temp-lineart-contained

LineArt: UI cleanups.

Wording on the UI, slider consistency and material mask switches layout.

Reviewed By: Sebastian Parborg (zeddb)

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

Cleanup: reserve C++ comments for disabled code

Use C comments for plain text.

Cleanup: use '#if 0' for disabling multiple lines

Cleanup: Commenting and minor refactoring

Merge branch 'master' into temp-geometry-nodes-curve-sample

Also copy curve non-auto texture space settings to generated curve

Merge branch 'master' into curve-nodes-modifier

Cleanup: Make function static, use const object argument

Also use `const Curve *` instead of `const Object *`, since the
function works at a lower level than objects anyway.

And also remove another unused function. Since this section of code
for converting curves to meshes will likely be replaced, it's nicer to
see which parts actually remain used at this point.