Blender Git Loki

Exporter: fix vertex normals not being exported

The smooth group calculation must be done before normals are
written, to decide between vertex normals and face normals.
So moved the smooth group array in the OBJMesh's private members.

Merge branch 'master' into mac_arm64

GPencil: Fix errors after merge

The parameter list has changed.

Merge branch 'master' into lanpr-under-gp

Merge branch 'master' into greasepencil-object

Merge branch 'master' into greasepencil-edit-curve

Conflicts:
source/blender/blenkernel/intern/gpencil_geom.c

Merge branch 'master' into mac_arm64

self collisions for simple scenes

moved collision detection back to inner loop

Collection Colors: Change defaults

Collection Colors: Add 4 new color slots

Collection Tags: Use numbers rather than fixed color names

Outliner: Cleanup collection color preferences

Cleanup the excess labels and code.

Merge branch 'master' into mac_arm64

LineArt: Fix isDisabled function

* The layer is not a pointer, but a name.
* Don't execute if it's disabled.

Cleanup.

Revert "macOS: Enabled Embree on arm64."

This reverts commit 86f207f4fdc17fa5ed6b600c1df9f8ed2e44d569.

octree for lattice gen and smaller dt with CD only at init solve

Fixed light tree construction.

There was a bug in the light tree construction that caused mesh lights
to appear as brighter than other lamp lights.

Null check: Break if no UV layer found.

Also conditionally add an UV layer, not always.