Commit: 01b748e6145c6b10dfe4cbed13a520129d59c6eb
Author: Antonio Vazquez
Date: Wed Feb 12 10:05:51 2020 +0100
Branches: greasepencil-object
https://developer.blender.org/rB01b748e6145c6b10dfe4cbed13a520129d59c6eb
Merge branch 'master' into greasepencil-object
Conflicts:
source/blender/draw/engines/gpencil/gpencil_engine.c
===================================================================
===================================================================
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
