Commit: c7253a52aaf04517877e9ef1bb0167cffeda8170
Author: Antonio Vazquez
Date: Mon Jun 28 19:44:15 2021 +0200
Branches: greasepencil-object
https://developer.blender.org/rBc7253a52aaf04517877e9ef1bb0167cffeda8170
Merge branch 'master' into greasepencil-object
Conflicts:
source/blender/draw/engines/gpencil/shaders/gpencil_common_lib.glsl
===================================================================
===================================================================
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
