Blender Git Loki

Merge branch 'master' into soc-2016-layer_manager

Declare Scene.base as deprecated!

It's not accessed anymore now.

Correct error in base iterator

Expose layer-base iterator in RNA (Cycles uses this too)

Scripts that iterate over bases shouldn't break.

Merge branch 'master' into soc-2016-layer_manager

Work towards deprecating Scene.base

Disabled depsgraph base sorting for now, need to check how this will be handled in future.
Realize base iterators definitely need to be improved to work for corner cases :S

Depsgraph: Use new layer based iterator

Support for early-breaking iterator was needed here, which I had to add in a rather ugly way.

Merge branch 'master' into soc-2016-layer_manager

Merge branch 'master' into soc-2016-layer_manager

Conflicts:
source/blender/blenkernel/BKE_blender_version.h
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/screen/screen_context.c

Merge branch 'master' into soc-2016-layer_manager

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

Merge branch 'master' into soc-2016-layer_manager

Conflicts:
source/blender/editors/space_outliner/outliner_tools.c

Add more layer visibility checks

Also had to add Object.layer which is synced with Base.layer, a bit hacky though. Could clean this up, but ideally we'd get rid of Base struct completely (think this is doable).

Add/use iterator for visible bases

It's basically used in all occurences in which BKE_BASES_ITER_START was used with additional base visibility checks. These places now also check for layer visibility.

Remove build option WITH_ADVANCED_LAYERS

So far this hasn't been useful at all, only causing trouble.

Merge branch 'master' into soc-2016-layer_manager

Fix layers ordered wrong way round after file read

Also fixes glitches when creating groups after file read.

Add layer visibility toggle

Currently only affects drawing, need to check all object iterations if they need a visibility check individually.

Alignment need to be improved, didn't find a quick solution though. Would need to be solved differently when moving to outliner anyway.

Fix crash adding object after opening saved .blend

And move stuff into own function.

Add/use layer type idname for reliable lookups on file read

The previously used enum wouldn't be safe to use with custom layers from python.

Cleanup layer writing code