[Bf-blender-cvs] [6052631] blender2.8: Merge remote-tracking branch 'origin/master' into blender2.8

[Dalai Felinto]

Commit: 605263177b8eea24c1449e4dbf0138175ec3dddf
Author: Dalai Felinto
Date:   Fri Dec 23 15:36:16 2016 +0100
Branches: blender2.8
https://developer.blender.org/rB605263177b8eea24c1449e4dbf0138175ec3dddf

Merge remote-tracking branch 'origin/master' into blender2.8

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



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

diff --cc source/blender/editors/space_view3d/drawsimdebug.c
index 286e582,9414d39..2baa630
--- a/source/blender/editors/space_view3d/drawsimdebug.c
+++ b/source/blender/editors/space_view3d/drawsimdebug.c
@@@ -164,17 -130,29 +164,31 @@@ static void draw_sim_debug_elements(Sim
  		if (elem->type != SIM_DEBUG_ELEM_VECTOR)
  			continue;
  		
 -		glColor3f(elem->color[0], elem->color[1], elem->color[2]);
 -		glVertex3f(elem->v1[0], elem->v1[1], elem->v1[2]);
 +		immAttrib3fv(color, elem->color);
 +		immVertex3fv(pos, elem->v1);
  		add_v3_v3v3(t, elem->v1, elem->v2);
 -		glVertex3f(t[0], t[1], t[2]);
 +		immVertex3fv(pos, t);
  	}
 -	glEnd();
 +	immEnd();
 +	
 +	immUnbindProgram();
+ 	
+ 	/**** strings ****/
+ 	
+ 	for (BLI_ghashIterator_init(&iter, debug_data->gh); !BLI_ghashIterator_done(&iter); BLI_ghashIterator_step(&iter)) {
+ 		SimDebugElement *elem = BLI_ghashIterator_getValue(&iter);
+ 		if (elem->type != SIM_DEBUG_ELEM_STRING)
+ 			continue;
+ 		
+ 		unsigned char col[4];
+ 		rgb_float_to_uchar(col, elem->color);
+ 		col[3] = 255;
+ 		view3d_cached_text_draw_add(elem->v1, elem->str, strlen(elem->str),
+ 		                            0, V3D_CACHE_TEXT_GLOBALSPACE, col);
+ 	}
  }
  
- void draw_sim_debug_data(Scene *UNUSED(scene), View3D *UNUSED(v3d), ARegion *ar)
+ void draw_sim_debug_data(Scene *UNUSED(scene), View3D *v3d, ARegion *ar)
  {
  	RegionView3D *rv3d = ar->regiondata;
  	/*Object *ob = base->object;*/
@@@ -185,10 -163,18 +199,12 @@@
  	
  	invert_m4_m4(imat, rv3d->viewmatob);
  	
 -//	glDepthMask(GL_FALSE);
 -//	glEnable(GL_BLEND);
 -	
  	glPushMatrix();
- 	
  	glLoadMatrixf(rv3d->viewmat);
+ 	
+ 	view3d_cached_text_draw_begin();
  	draw_sim_debug_elements(_sim_debug_data, imat);
+ 	view3d_cached_text_draw_end(v3d, ar, false, NULL);
  	
  	glPopMatrix();
 -	
 -//	glDepthMask(GL_TRUE);
 -//	glDisable(GL_BLEND);
  }