Blender Git Loki

Fix T74221 Crash when changing Image Source in UV editor

Merge branch 'undo-experiments' into undo-experiments-swap-reread-datablocks

Merge branch 'id-ensure-unique-memory-address' into undo-experiments

Ensure IDs get unique memory addresses withing q given editing session.

Disclaimer: this should be considered as an engeneering, explanatory patch.

Rational: for undo work, we are now manipulating IDs from potentially many different 'memory realms' (in contrast to current undo system, where, since we always reallocate the whole main database at each undo step, we only ever have to deal with two, the old one from the memfile, and the new one from re-read data from that memfile).

So far, new undo system has used ID names-based search to remap old to new pointers, but this is slower, less safe, and forces us to do full undo barrier e.g. when renaming an ID.

Idea of this patch is instead to ensure that within a given editing session, we never ever allocate a data-block at the same address twice. That way, we can consider ID pointers as valid UIDs withing that scope, and use their values to handle remapping in udo steps even in case an ID has had several memory addresses in the history of the editing session.

This patches does two things:
# Add a way to ensure a newly allocated ID gets a memory address never used before for any ID.
# Store the history of all memory addresses ever used by a given ID.

Note that point 1 above is currently using a fairly simple and naive solution, but also quiet innefficient (just allocating again and again until we get a 'free' address), we can imagine a much more efficient solution if we go deeper in MEM_ allocator system itself. Not sure if it is worth it though, as with new undo system actual re-allocation of a same ID at a different address should be fairly rare (i.e. history of used/forbidden addresses should remain quiet short).

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

EEVEE: Fix crash on certain drivers caused by redefined constant

Merge branch 'master' into id-ensure-unique-memory-address

Various updates/cleanups after recent changes.

Mainly:
* Use a simple `GSet` instead of an `IDNameLib_Map` for storing valid
old IDs pointers (since we do not need to complex name-based search
anymore).
* Use new `BKE_main_idmemhash_lookup_id` helper to search into history
of IDs memaddresses.

Merge branch 'undo-experiments' into undo-experiments-swap-reread-datablocks

Merge branch 'id-ensure-unique-memory-address' into undo-experiments

Cleanup; add missing static statement.

Fix build error on Windows

Merge branch 'undo-experiments' into undo-experiments-swap-reread-datablocks

Merge branch 'master' into new-object-types

Merge branch 'master' into new-object-types

Cleanup: don't set renderpass_block twice for volumes

UI: add kerning menu for 3D text editing

Fix for recent merge.

Merge branch 'id-ensure-unique-memory-address' into undo-experiments

Rework a bit re-allocating code, add a lookup utils for history memaddresses.

Cleanup: avoid path copy in XDG support