Blender Git Loki

Merge branch 'master' into id-remap

Merge branch 'master' into id-remap

Do not try to reload directly non-linkable datablocks (shapekeys),
those will get reloaded by 'owner' mesh anyway.

Why, why, why are shapekeys datablocks???

Fix Text usage by TextEditor (USER_REAL, not USER_ONE).

Rework a bit IDRemap struct to separate input flags from output status, and fix
issues with unlinking ParticleSettings.

We now have the option to still decrement user count of old_id, even if we could not
replace it with NULL new_id (aka unlinking), needed to keep proper user count when
unlinking and ID from datablocks it uses, to delete it.

Merge branch 'master' into id-remap

Merge branch 'master' into id-remap

Silence a bit debug prints!

Merge branch 'master' into id-remap

Merge branch 'master' into id-remap

Merge branch 'master' into id-remap

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

Also clears now useless 'bool is_user_one' flag from editors' ID remap callback.

Some minor tweaks.

Merge branch 'master' into id-remap

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

Hopefully fix the 'real user' nightmare.

Idea is to add two new flags, one saying 'we need to ensure a real user exists',
the other 'we had to increment user count to ensure we have a real user'.

This allows us to easily control the extra user in release/delete/remap cases,
and also fixes the infamous 'add new image to texture, open image in ImageEditor,
delete image from texture, have a zero-user red image in Image Editor' issue.

There is still much to be done here, more places where we can use those flags,
also clear them when we force usercount to zero, etc.

All this allows us to fix unsolvable issues (like Group being ensure_user'ed
in loading code, but only if they do have objects in them), and to avoid returning
ugly bool from editors' callbacks (this is still to be cleaned up in the branch too).

Bad news - this means we cannot use short ID->flag anymore (not enough flags), for now
added a new int ID->flag2 (replacing pad int), not sure how to best manage change here,
maybe for 2.8 we can totally wipe ID->flag? But this would totally break forward compat.

Merge branch 'master' into id-remap

Merge branch 'master' into id-remap

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

Minor update/cleanup on usercount, from work done in master.

Merge branch 'master' into id-remap

Conflicts:
source/blender/blenkernel/intern/curve.c
source/blender/blenkernel/intern/linestyle.c
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/mball.c
source/blender/blenkernel/intern/mesh.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/particle.c
source/blender/blenkernel/intern/scene.c
source/blender/blenkernel/intern/world.c

Merge branch 'master' into id-remap

Cleanup: get rid of bmain in foreach ID callback.

messing with depsgraph here is not a good idea I think... and makes things simpler!