[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52685] trunk/blender/source/blender/bmesh /intern/bmesh_mesh_conv.c: fix own mistake in recent commit - entering editmode with a shape key crashed .

[Campbell Barton]

Revision: 52685
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52685
Author:   campbellbarton
Date:     2012-11-30 14:27:25 +0000 (Fri, 30 Nov 2012)
Log Message:
-----------
fix own mistake in recent commit - entering editmode with a shape key crashed.

Modified Paths:
--------------
    trunk/blender/source/blender/bmesh/intern/bmesh_mesh_conv.c

Modified: trunk/blender/source/blender/bmesh/intern/bmesh_mesh_conv.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_mesh_conv.c	2012-11-30 13:42:52 UTC (rev 52684)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_mesh_conv.c	2012-11-30 14:27:25 UTC (rev 52685)
@@ -220,11 +220,11 @@
 
 		normal_short_to_float_v3(v->no, mvert->no);
 
+		/* Copy Custom Data */
+		CustomData_to_bmesh_block(&me->vdata, &bm->vdata, i, &v->head.data);
+
 		BM_elem_float_data_set(&bm->vdata, v, CD_BWEIGHT, (float)mvert->bweight / 255.0f);
 
-		/* Copy Custom Dat */
-		CustomData_to_bmesh_block(&me->vdata, &bm->vdata, i, &v->head.data);
-
 		/* set shapekey data */
 		if (me->key) {
 			/* set shape key original index */