Commit: b281b0fb6c04e22bbfbf75f1eb6af6e3ec51f854
Author: Antonio Vazquez
Date: Wed Jun 20 09:43:55 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rBb281b0fb6c04e22bbfbf75f1eb6af6e3ec51f854
Merge branch 'blender2.8' into greasepencil-object
Conflicts:
source/blender/editors/space_outliner/outliner_draw.c
===================================================================
===================================================================
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
