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

[Campbell Barton]

Commit: 01a5cd5cec28ff62668825f4568356850508b58b
Author: Campbell Barton
Date:   Mon Apr 3 13:01:56 2017 +1000
Branches: custom-manipulators
https://developer.blender.org/rB01a5cd5cec28ff62668825f4568356850508b58b

Merge branch 'blender2.8' into custom-manipulators

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



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

diff --cc source/blender/editors/space_view3d/view3d_draw.c
index eb9ac304288,eef040053e9..ab2bf97b9ef
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@@ -2326,8 -2308,10 +2315,10 @@@ static void view3d_draw_view(const bCon
  	view3d_draw_other_elements(C, ar);
  	view3d_draw_tool_ui(C);
  	view3d_draw_reference_images(C);
 -	view3d_draw_manipulator(C);
 +	view3d_draw_manipulators(C, ar);
  
+ 	gpuMatrixEnd();
+ 
  	glDisable(GL_DEPTH_TEST);
  
  	view3d_draw_region_info(C, ar);