Blender Git Loki

Merge branch 'id_override_static' into asset-engine

Merge branch 'blender2.8' into id_override_static

Some cleanup/renaming, and move 'self remapping' into new id_swap function.

I can't think of any case where we would swap content of two IDs while
wanting to keep old 'self' ID pointers after the swap!

Rename destination and source parameters in override_apply.

local and reference are awfully confusing names here, since destination
is a copy of reference that will become local override once applied, and
source is .blend-file-written version of local override...

Add custom override_apply func for animdata.

This makes creating animation in overridden ID working, at least in the
most basic case...

Merge branch 'id_override_static' into asset-engine

Merge branch 'blender2.8' into id_override_static

Merge branch 'id_override_static' into asset-engine

Heavy refactor of new RNA override/comparison code.

Main reason here is to make comparison/override_diff/override_store/override_apply
customizable per RNA property if needed.

This should allow us especially to get advanced behavior on case-by-case
basis, when dealing with Pointer and Collection properties mostly.

Note that IDProps remain fuzzy area for now, a big part of the code
tries to take them into account, but it's most likely still missing some
bits, and definitively not tested at all yet!

Some cleanup, fix auto-override handling in NULL pointer case.

Also, attempt to enable animation override, not yet working though think
we need some re-design of how override is handled per-property type...

Merge branch 'blender2.8' into id_override_static

Merge branch 'id_override_static' into asset-engine

Cleanup while attempting to fix auto-override detection in DEG.

Not sure why that piece of code stopped working, but now this operation
is pretty much never evaluated... Will have to either dig deeper in DEG
or ask Sergey about it, but not a crucial issue for now.

Auto-override detection: ignore animated properties.

Animation is by definition another kind of (dynamic) override of properties,
which supersedes static override.

Note that this could be debated in some corner cases ('differential'
animation, like dloc/drot/dscale), but think we can ignore that for now,
and expect user to handle those manually when needed.

Cleanup while attempting to fix auto-override detection in DEG.

Not sure why that piece of code stopped working, but now this operation
is pretty much never evaluated... Will have to either dig deeper in DEG
or ask Sergey about it, but not a crucial issue for now.

Auto-override detection: ignore animated properties.

Animation is by definition another kind of (dynamic) override of properties,
which supersedes static override.

Note that this could be debated in some corner cases ('differential'
animation, like dloc/drot/dscale), but think we can ignore that for now,
and expect user to handle those manually when needed.

Merge branch 'id_override_static' into asset-engine

Conflicts:
source/blender/blenloader/BLO_readfile.h
source/blender/blenloader/intern/readfile.c
source/blender/windowmanager/intern/wm_files_link.c

Merge branch 'blender2.8' into id_override_static

Conflicts:
source/blender/depsgraph/intern/builder/deg_builder_nodes.cc

Merge branch 'id_override_static' into asset-engine

Conflicts:
source/blender/blenloader/intern/readfile.c
source/blender/makesdna/DNA_ID.h

Merge branch 'blender2.8' into id_override_static