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

[Campbell Barton]

Commit: a45ca3c724799047779921efaba8badde572a24f
Author: Campbell Barton
Date:   Tue Jun 6 17:13:58 2017 +1000
Branches: custom-manipulators
https://developer.blender.org/rBa45ca3c724799047779921efaba8badde572a24f

Merge branch 'blender2.8' into custom-manipulators

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



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

diff --cc source/blender/windowmanager/manipulators/intern/wm_manipulator.c
index 626ed8acf52,7b755cace36..179a4a61fe3
--- a/source/blender/windowmanager/manipulators/intern/wm_manipulator.c
+++ b/source/blender/windowmanager/manipulators/intern/wm_manipulator.c
@@@ -317,12 -321,6 +322,7 @@@ void WM_manipulator_set_colors(wmManipu
  	copy_v4_v4(manipulator->col, col);
  	copy_v4_v4(manipulator->col_hi, col_hi);
  }
 +
- void WM_manipulator_set_origin(wmManipulator *manipulator, const float origin[3])
- {
- 	copy_v3_v3(manipulator->origin, origin);
- }
- 
  /** \} */ // Manipulator Creation API