[Bf-blender-cvs] [98b6c6f2c02] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: 98b6c6f2c0227b9a6d9db8bd47ee6cad27f35b4b
Author: Campbell Barton
Date:   Thu Apr 27 21:41:57 2017 +1000
Branches: blender2.8
https://developer.blender.org/rB98b6c6f2c0227b9a6d9db8bd47ee6cad27f35b4b

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/editors/space_view3d/drawobject.c
index bafd74e4c54,61dd2d7c912..7fe4a1d3570
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@@ -8913,9 -7823,9 +8910,9 @@@ afterdraw
  			draw_new_particle_system(scene, v3d, rv3d, base, psys, dt, dflag);
  		}
  		invert_m4_m4(ob->imat, ob->obmat);
- 		view3d_cached_text_draw_end(v3d, ar, 0, NULL);
+ 		view3d_cached_text_draw_end(v3d, ar, 0);
  
 -		glMultMatrixf(ob->obmat);
 +		gpuMultMatrix(ob->obmat);
  		
  		//glDepthMask(GL_TRUE);
  		if (col) cpack(col);
diff --cc source/blender/editors/space_view3d/drawsimdebug.c
index e06336c621b,3f23d4aa09a..24ac1c5b4db
--- a/source/blender/editors/space_view3d/drawsimdebug.c
+++ b/source/blender/editors/space_view3d/drawsimdebug.c
@@@ -203,7 -171,10 +203,7 @@@ void draw_sim_debug_data(Scene *UNUSED(
  	
  	view3d_cached_text_draw_begin();
  	draw_sim_debug_elements(_sim_debug_data, imat);
- 	view3d_cached_text_draw_end(v3d, ar, false, NULL);
+ 	view3d_cached_text_draw_end(v3d, ar, false);
  	
 -	glPopMatrix();
 -	
 -//	glDepthMask(GL_TRUE);
 -//	glDisable(GL_BLEND);
 +	gpuPopMatrix();
  }