Commit: ce5ecd19b3540f92a7aeb1d8dd2404f0f8075dcd
Author: Antonio Vazquez
Date: Tue Jun 12 13:56:46 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rBce5ecd19b3540f92a7aeb1d8dd2404f0f8075dcd
Merge branch 'blender2.8' into greasepencil-object
Conflicts:
source/blender/editors/include/ED_object.h
source/blender/editors/object/object_modifier.c
===================================================================
===================================================================
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
