Blender Git Loki

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

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

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

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

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

use new 'unique realloc' of ID.

that way we do not have to stupidly ensure unique addresses of all IDs
read during an undo step, but only for those we actually need.

Combined with the 'almost always reuse old address' feature of undo swap
branch, this should ensure us to almost never call that code in
practice.

Fix assert position.

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

Minor fixes/cleanup.

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

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

Rework the whole unique ID system to also store ID addresses history in Main's mapping.

In the end, since this is a runtime/editing session data only, makes
more sense to store it here than in ID struct itself. And it's probably
also more efficient to handle.

id-unique system: add also realloc utils.

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

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

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

Merge branch 'readfile-rework-refcount-handling' into id-ensure-unique-memory-address

Merge branch 'master' into readfile-rework-refcount-handling

Merge branch 'master' into readfile-rework-refcount-handling

get rid of all remaining usage of `newlibadr_us` in readfile code.

Old deprecated IPOs data-blocks are not refcounted at all anymore,
however that should not be an issue since after doversion we get rid of
them anyway.

Merge branch 'master' into readfile-rework-refcount-handling

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