Commit: 94e24b7e42c99a5a29c2bde56fe8ecaf54d8bbd6
Author: Antonio Vazquez
Date: Mon Mar 2 13:27:07 2020 +0100
Branches: greasepencil-object
https://developer.blender.org/rB94e24b7e42c99a5a29c2bde56fe8ecaf54d8bbd6
Merge branch 'master' into greasepencil-object
Conflicts:
source/blender/makesdna/DNA_brush_types.h
===================================================================
===================================================================
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
