Blender Git Commit Log

Merge branch 'master' into temp-geometry-nodes-instance-collections

add comment

Fix: remove `show_group_colors` from graph editor menu

The `show_group_colors` option was moved to the user preferences in
ad85256e71, but accidentally remained in the graph editor menu.

Merge branch 'master' into temp-geometry-nodes-mix-attributes

Geometry Nodes: improve support for Color attributes

* Add typed attribute accessors for color attributes.
* Support implicit conversions between colors and floats.

Geometry Nodes: add custom data type getter for attribute accessor

This is just an utility method, that avoids that the caller has to do
the conversion every time it is necessary.

Merge branch 'master' into temp-geometry-nodes-mix-attributes

Merge branch 'geometry-nodes' into temp-geometry-nodes-mix-attributes

Merge branch 'master' into refactor-idprop-ui-data

encapsulate DataStore.time_sampling

Geometry Nodes: pick between instancing collection and object

Fix T83315: Crash showing animation channel context menu after baking sound

Fix a crash when right-clicking in the Graph Editor animation channel
list. The code for getting selected keyframes was not checking for baked
curves.

fix function used to detect arrays

cleanup, format

Fix Cycles device kernels containing debug assertation code

NanoVDB includes "assert.h" and makes use of "assert" in several places and since the compile
pipeline for CUDA/OptiX kernels does not define "NDEBUG" for release builds, those debug
checks were always added. This is not intended, so this patch disables "assert" for CUDA/OptiX
by defining "NDEBUG" before including NanoVDB headers.
This also fixes a warning about unknown pragmas in NanoVDB thrown by the CUDA compiler.

Tracking: Improve multithreading of tracking many markers

This change solves a bottleneck which was caused by attempt to cache
postprocessed search areas used for tracking. It was a single cache
used by all threads, which required to have some synchronization
mechanism. This synchronization turned out to be making all threads
to idle while one thread is accessing the cache. The access was not
cheap, so the multi-threading did not provide expected speedup.

Current solution is to remove the cache of search areas. This avoids
any threading synchronization overhead because there is no need for
it anymore. The downside is that for certain configurations tracking
became slower when comparing to master branch. There is no expected
slowdown compared to 2.91 release.

The slowdown is mainly experienced when using big search area and
keyframe matching strategy. Other cases should still be within a
ballpark of performance of single-threaded code prior to this change.
The reason why is it so is because while this change makes it so the
image accessors needs to process images multiple times the complexity
of this process is almost the same as all the overhead for the cache
lookup and maintenance.

Here are Some numbers gained on different configurations.

CPU: Intel Xeom CPU E5-2699 v4
OS: Linux
Footage: Old_Factory MVI_4005.mov from the first part of Track Match
Blend training which can be found on the Blender Cloud.

Tracking 443 markers across 250 frames. The unit is seconds.
File: F9433209

2.91: 401.520874
before: 358.650055
after: 14.966302

Tracking single marker across 250 frames. The unit is seconds.
File: F9433211

2.91 before after
Big keyframe 1.307203 1.005324 1.227300
Big previous frame 1.144055 0.881139 0.944044
Small keyframe 0.434015 0.197760 0.224982
Small previous frame 0.463207 0.218058 0.234172
All at once 2.338268 1.481220 1.518060

Merge branch 'master' into asset-browser

add support for reading curve radiuses from the archive

Geometry Nodes: initial collection instancing

Fix: replace ID_CO with ID_GR