[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22979] branches/bmesh/blender/source/ blender/editors/space_view3d/drawobject.c: draw face normals option doesn' t crash anymore

[Joseph Eagar]

Revision: 22979
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22979
Author:   joeedh
Date:     2009-09-04 04:16:08 +0200 (Fri, 04 Sep 2009)

Log Message:
-----------
draw face normals option doesn't crash anymore

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

Modified: branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c	2009-09-04 01:51:27 UTC (rev 22978)
+++ branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c	2009-09-04 02:16:08 UTC (rev 22979)
@@ -1461,7 +1461,7 @@
 	Scene *scene= ((void **)userData)[0];
 	BMEditMesh *em = ((void **)userData)[1];
 	BMFace *efa = EDBM_get_face_for_index(em, index);
-	ToolSettings *ts= ((Scene *)userData)->toolsettings;
+	ToolSettings *ts= scene->toolsettings;
 
 	if (!BM_TestHFlag(efa, BM_HIDDEN)) {
 		glVertex3fv(cent);
@@ -1470,9 +1470,9 @@
 					cent[2] + no[2]*ts->normalsize);
 	}
 }
-static void draw_dm_face_normals(BMEditMesh *tm, Scene *scene, DerivedMesh *dm) 
+static void draw_dm_face_normals(BMEditMesh *em, Scene *scene, DerivedMesh *dm) 
 {
-	void *ptrs[2] = {scene, tm};
+	void *ptrs[2] = {scene, em};
 
 	glBegin(GL_LINES);
 	dm->foreachMappedFaceCenter(dm, draw_dm_face_normals__mapFunc, ptrs);