Blender Git Loki

Get file read/write and undo to work - finally

Merge branch 'master' into soc-2016-layer_manager

And make manual adjustments of merged parts to fit changes in branch.
Conflicts:
source/blender/blenkernel/intern/library_remap.c
source/blender/blenkernel/intern/object.c
source/blender/editors/animation/anim_filter.c

Fix objects not assigned to active layer when duplicating

Assign objects to active layer by default on link/append

Could add further options later.

Fix: No way to assign object to layer if it isn't assigned to one yet

Should be a temporary fix as long as it's possible to have objects that are not assigned to a layer.

Fix compiling without WITH_ADVANCED_LAYERS enabled (tm)

Replace most Scene.base iterations with new iterator

Most changes are un-tested :)

Add utility iterator for easy base iterations

Always add object to active layer

I doubt all cases in which we have to assign an object after creation to a layer are covered, but this should be good enough for the start.
It's also quite easy to break object creation since there isn't any logic that ensures there's always an active layer (or any layer at all).

Make active layer a scene level property

Fix crash when deleting any object

Drop support for objects in multiple layers (for now)

I don't want to waste time trying to keep this working if we eventually decide to drop it. If we decide to keep it, I can still bring it back.
Note that compatibility can be kept even without support for objects on multiple layers.

Give objects info about the layer they're in

We can avoid quite some lookups by doing this.
It's technically not complete yet, but will continue work in a separate commit.

Merge branch 'master' into soc-2016-layer_manager

Cleanup: Correct comment

Merge branch 'master' into soc-2016-layer_manager

Get layer drag & drop with layer groups to work

Still get some occasional crashes but have to investigate at another time.

Merge branch 'master' into soc-2016-layer_manager

Avoid recursive drawing of layer group members

Fix layer selection broken with collapsed groups