Blender Git Loki

Merge branch 'render-layers' into clay-engine

Depsgraph hack: DEG_OBJECT_ITER and base_flag

This is a temporary iterator that flushes the base flag to the object

Merge branch 'render-layers' of git.blender.org:blender into clay-engine

More Object mode work.

UI: temporary panels for layer/collections

bpy.ops.collections.* accessible outside collection editor

bpy.ops.collections.select()

When we introduce overrides we will extend it to have override_index,
and if it is -1, only set the collection

bpy.ops.collections.collection_new()

Cycles: Workaround for driver hangs

Simple workaround for some issues we've been having with AMD drivers hanging
and rendering systems unresponsive. Unfortunately this makes things a bit
slower, but its better than having to do hard reboots. Will be removed when
drivers have been fixed.

Define CYCLES_DISABLE_DRIVER_WORKAROUNDS to disable for testing purposes.

Merge branch 'master' into id_override_static

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

Remove old layers bitflag from viewport 3d header template

Let scene_collection and layer_collection to have the same fallback

Initial implementation of instancing

Show Render Layer panel to clay engine.

Merge branch 'master' into asset-engine

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

Add icon to collection panel

Fix logic for bpy.context.scene_collection

Unittest: refresh blender between tests

Use impulse clustering for self collisions

Also adjust impulse scaling to work better with the new clustering.

Use optimized approximated impulse clustering