Commit: 328ef0121cd196ac4b5e7cb293571424dcc05725
Author: Antonio Vazquez
Date: Thu Sep 10 16:52:56 2020 +0200
Branches: greasepencil-object
https://developer.blender.org/rB328ef0121cd196ac4b5e7cb293571424dcc05725
Merge branch 'master' into greasepencil-object
Conflicts:
source/blender/blenkernel/intern/gpencil_geom.c
===================================================================
===================================================================
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
