Commit: 3bd56a33d914914e7af7249ee019425c24af0eb0
Author: Antonioya
Date: Sat Jul 6 16:16:08 2019 +0200
Branches: greasepencil-object
https://developer.blender.org/rB3bd56a33d914914e7af7249ee019425c24af0eb0
Merge branch 'master' into greasepencil-object
Conflicts:
source/blender/draw/engines/gpencil/gpencil_engine.h
===================================================================
===================================================================
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
