Commit: 8a43814e03b3b7dbfa09db00b99ae5ac34344de9
Author: Antonio Vazquez
Date: Mon Jan 27 11:35:28 2020 +0100
Branches: greasepencil-refactor
https://developer.blender.org/rB8a43814e03b3b7dbfa09db00b99ae5ac34344de9
Merge branch 'greasepencil-object' into greasepencil-refactor
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
