Commit: f6f7127320f5967742e49c1f5d3dc0098ca414f5
Author: Bastien Montagne
Date: Tue Nov 7 15:47:43 2017 +0100
Branches: asset-engine
https://developer.blender.org/rBf6f7127320f5967742e49c1f5d3dc0098ca414f5
Merge branch 'id_override_static' into asset-engine
Conflicts:
source/blender/blenloader/intern/readfile.c
source/blender/makesdna/DNA_ID.h
===================================================================
===================================================================
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
