[Bf-blender-cvs] [058b6ea3e9a] asset-engine: Merge branch 'id_override_static' into asset-engine

[Bastien Montagne]

Commit: 058b6ea3e9a3e90523f695cc96b6acb7a1a3dfc9
Author: Bastien Montagne
Date:   Tue Nov 14 22:36:02 2017 +0100
Branches: asset-engine
https://developer.blender.org/rB058b6ea3e9a3e90523f695cc96b6acb7a1a3dfc9

Merge branch 'id_override_static' into asset-engine

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



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