[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27244] trunk/blender/source/blender/ editors/space_view3d/drawobject.c: bugfix [#21428] Particle number display offset

Campbell Barton ideasman42 at gmail.com
Wed Mar 3 12:40:12 CET 2010


Revision: 27244
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27244
Author:   campbellbarton
Date:     2010-03-03 12:40:12 +0100 (Wed, 03 Mar 2010)

Log Message:
-----------
bugfix [#21428] Particle number display offset

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_view3d/drawobject.c

Modified: trunk/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawobject.c	2010-03-03 11:23:59 UTC (rev 27243)
+++ trunk/blender/source/blender/editors/space_view3d/drawobject.c	2010-03-03 11:40:12 UTC (rev 27244)
@@ -3383,6 +3383,9 @@
 		glMultMatrixf(mat);
 	}
 
+	/* needed for text display */
+	invert_m4_m4(ob->imat, ob->obmat);
+
 	totpart=psys->totpart;
 
 	//if(part->flag&PART_GLOB_TIME)
@@ -3694,6 +3697,7 @@
 				}
 
 				if((part->draw & PART_DRAW_NUM || part->draw & PART_DRAW_HEALTH) && !(G.f & G_RENDER_SHADOW)){
+					float vec_txt[3];
 					char *val_pos= val;
 					val[0]= '\0';
 
@@ -3705,7 +3709,8 @@
 
 					/* in path drawing state.co is the end point */
 					/* use worldspace beause object matrix is alredy applied */
-					view3d_cached_text_draw_add(state.co[0],  state.co[1],  state.co[2], val, 10, V3D_CACHE_TEXT_WORLDSPACE);
+					mul_v3_m4v3(vec_txt, ob->imat, state.co);
+					view3d_cached_text_draw_add(vec_txt[0],  vec_txt[1],  vec_txt[2], val, 10, V3D_CACHE_TEXT_WORLDSPACE);
 				}
 			}
 		}





More information about the Bf-blender-cvs mailing list