[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29292] branches/soc-2010-jwilkins/source/ blender/editors/mesh/editmesh_tools.c: fix to bug - [#20084] merging two triangle to a quad creates a hole.

[Tom Musgrove]

Revision: 29292
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29292
Author:   letterrip
Date:     2010-06-07 04:12:54 +0200 (Mon, 07 Jun 2010)

Log Message:
-----------
fix to bug - [#20084] merging two triangle to a quad creates a hole.

Modified Paths:
--------------
    branches/soc-2010-jwilkins/source/blender/editors/mesh/editmesh_tools.c

Modified: branches/soc-2010-jwilkins/source/blender/editors/mesh/editmesh_tools.c
===================================================================
--- branches/soc-2010-jwilkins/source/blender/editors/mesh/editmesh_tools.c	2010-06-07 00:21:05 UTC (rev 29291)
+++ branches/soc-2010-jwilkins/source/blender/editors/mesh/editmesh_tools.c	2010-06-07 02:12:54 UTC (rev 29292)
@@ -7113,6 +7113,7 @@
 	Object *obedit= CTX_data_edit_object(C);
 	EditMesh *em= BKE_mesh_get_editmesh((Mesh *)obedit->data);
 
+	EM_recalc_normal_direction(em, 0, 1); /* recalc outside so that joining doesn't create a hole */
 	join_triangles(em);
 
 	DAG_id_flush_update(obedit->data, OB_RECALC_DATA);