Blender Git Loki

Merge branch 'master' into id-remap

Conflicts:
source/blender/blenkernel/intern/library.c

Merge branch 'master' into id-remap

Merge branch 'master' into id-remap

Conflicts:
source/blender/blenkernel/BKE_library.h
source/blender/blenkernel/BKE_material.h

Merge branch 'master' into id-remap

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

Merge branch 'master' into id-remap

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 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 'master' into id-remap

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

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

Merge branch 'master' into id-remap

Better handling of usercount during ID deletion, also add this to ID RNA API.

Seems to work for simple cases, but deletion of complex libs from complex files
(Gooseberry ones) still generates lots of assert failures, and crashes in some cases.

Merge branch 'master' into id-remap