Commit: b98df2831c3992d5dd891095a0548fa130c33762 Author: Antonio Vazquez Date: Fri Mar 2 11:29:28 2018 +0100 Branches: greasepencil-object https://developer.blender.org/rBb98df2831c3992d5dd891095a0548fa130c33762
Merge branch 'blender2.8' into greasepencil-object Conflicts: source/blender/editors/object/object_edit.c source/blender/editors/object/object_select.c =================================================================== =================================================================== _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs