Commit: 7726e46fe6e94e3a12f546ce52727057f7f3abe5
Author: Antonio Vazquez
Date: Fri May 4 18:43:27 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB7726e46fe6e94e3a12f546ce52727057f7f3abe5
Merge branch 'blender2.8' into greasepencil-object
Conflicts:
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
===================================================================
===================================================================
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
