Blender Git Loki

Merge branch 'master' into id-remap

Conflicts:
source/blender/editors/space_outliner/outliner_edit.c
source/blender/editors/space_outliner/outliner_intern.h
source/blender/editors/space_outliner/outliner_tools.c

Merge branch 'master' into id-remap

Merge branch 'id-remap' into asset-experiments

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

Merge main remap funcs' bool parameters into a single bitflag.

Too much bools kill bools.

More cleanup - remove unused stuff, some simplifications.

Cleanup: mostly removes useless diff from master.

Merge branch 'id-remap' into asset-experiments

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

Merge branch 'asset-engine' into asset-experiments

Merge branch 'master' into asset-experiments

Merge branch 'master' into asset-engine

Merge branch 'master' into id-remap

Merge branch 'master' into asset-engine

Merge branch 'master' into id-remap

Conflicts:
source/blender/blenkernel/intern/text.c
source/blender/editors/space_outliner/outliner_edit.c
source/blender/editors/space_outliner/outliner_tools.c

Merge branch 'master' into id-remap

Fix several issues with logic of core id-remap:

* We need to clear the 'user-one' flags and potential usercount for old_id.
* We need to consider ID usages inside a same lib as **never** being indirect ones.

Also re-enabled proxy checking for now (not sure why I commented it, think testing stuff or so...).

Fix id-remap looper not 'freeing' 'use-one' id usercount.

Merge branch 'master' into id-remap

Merge branch 'master' into asset-engine

Conflicts:
source/blender/editors/space_file/file_intern.h
source/blender/editors/space_file/file_ops.c

Some more fixes, and make Outliner's delete available for all IDs, not only libraries!

Merge branch 'master' into id-remap