Commit: cb7440201abe2c24913488ba42f16406bf0ecc34
Author: Antonio Vazquez
Date:   Tue Dec 3 12:13:04 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rBcb7440201abe2c24913488ba42f16406bf0ecc34

Merge branch 'master' into greasepencil-object

 Conflicts:
        source/blender/draw/engines/gpencil/gpencil_draw_utils.c

===================================================================



===================================================================



_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to