[Bf-blender-cvs] [5a1a6dfd1e6] asset-engine: Merge branch 'id_override_static' into asset-engine

[Bastien Montagne]

Commit: 5a1a6dfd1e6ee9e07cc06bfee71a67ccf4b33ec8
Author: Bastien Montagne
Date:   Mon Nov 6 20:26:37 2017 +0100
Branches: asset-engine
https://developer.blender.org/rB5a1a6dfd1e6ee9e07cc06bfee71a67ccf4b33ec8

Merge branch 'id_override_static' into asset-engine

Conflicts:
	source/blender/blenkernel/intern/library.c
	source/blender/blenkernel/intern/node.c
	source/blender/makesdna/DNA_ID.h

===================================================================



===================================================================