Blender Git Loki

Merge branch 'id-remap' into asset-experiments

Conflicts:
source/blender/makesdna/DNA_ID.h

Merge branch 'master' into asset-engine

Conflicts:
source/blender/makesdna/DNA_ID.h

Merge branch 'master' into id-remap

Conflicts:
source/blender/blenloader/intern/readfile.c

Slight refactor of the mesh exporting code.

Move most functions to gather data out of the AbcMeshWriter class into
static utility functions.

fixed domain switching - now using flags correctly

Rename UV_OT_shortest_path to UV_OT_select_shortest_path

Should have been commited with the UI menu entry commit...

Adding PEDGE_DIAG tag to diagonal edges of quads (parametrizer data structures are triangle only)

WIP: Select Shortest Path: Add UI menu entry for operator

UV Editor: Select -> Select Shortest Path

Fixed crash with no material meshes

cleaned up scripts and init functions which use them

Merge branch 'master' into soc-2016-multiview

update correspondence data structure

Fix compilation error

Use a hash map to store object reader / object path pair to be able to
reconstruct the object hierarchy more easily.

The previous approach was brute forcing by iterating over all the
objects in the scene for each object creating to find the object
(parent) that has the same name as its parent in the abc archive.

This was both inefficient and prone to errors since multiple objects in
the abc archive can have the same name, as long as their path are
different, but Blender only allows for unique object name, so the wrong
object could have been choosen as the parent of a given object.

Now all of the tests file import correctly.

Merge branch 'master' into alembic_basic_io

Merge branch 'master' into soc-2016-pbvh-painting

Fix undo and file reading after deleting layer with content

Reduce memory allocations in layer remove operator

Cleanup: Add/correct comments

Fix compiling/viewport drawing with WITH_ADVANCED_LAYERS disabled