Commit: cdae1ae99cf8615bfcf3402b832cb14bdc808930
Author: Antonio Vazquez
Date: Mon Dec 2 17:22:09 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rBcdae1ae99cf8615bfcf3402b832cb14bdc808930
Merge branch 'master' into greasepencil-object
Conflicts:
source/blender/draw/intern/draw_manager.c
===================================================================
===================================================================
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
