[Bf-blender-cvs] [903ebdb96cd] custom-manipulators: Merge branch 'blender2.8' into custom-manipulators

[Campbell Barton]

Commit: 903ebdb96cd0143cd4563917e315ef7638ed9d9f
Author: Campbell Barton
Date:   Fri Mar 31 18:32:16 2017 +1100
Branches: custom-manipulators
https://developer.blender.org/rB903ebdb96cd0143cd4563917e315ef7638ed9d9f

Merge branch 'blender2.8' into custom-manipulators

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



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

diff --cc source/blender/editors/object/object_ops.c
index b186c802f9c,91950872a3d..8e1eaa08db2
--- a/source/blender/editors/object/object_ops.c
+++ b/source/blender/editors/object/object_ops.c
@@@ -257,8 -249,7 +257,9 @@@ void ED_operatortypes_object(void
  
  	WM_operatortype_append(OBJECT_OT_data_transfer);
  	WM_operatortype_append(OBJECT_OT_datalayout_transfer);
+ 	WM_operatortype_append(OBJECT_OT_surfacedeform_bind);
 +
 +	WM_operatortype_append(OBJECT_OT_widget_add);
  }
  
  void ED_operatormacros_object(void)