Commit: ddd697cd28a8136aa6c3d5aac8c7b71452030015
Author: Antonio Vazquez
Date: Thu Feb 17 16:50:19 2022 +0100
Branches: asset-greasepencil
https://developer.blender.org/rBddd697cd28a8136aa6c3d5aac8c7b71452030015
Merge branch 'master' into asset-greasepencil
Conflicts:
source/blender/makesdna/DNA_gpencil_types.h
===================================================================
===================================================================
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
