[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29316] trunk/blender/source/blender/ editors/object/object_vgroup.c: Bugfix: copying a newly-created vertex group caused a crash.

[Nicholas Bishop]

Revision: 29316
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29316
Author:   nicholasbishop
Date:     2010-06-07 20:50:19 +0200 (Mon, 07 Jun 2010)

Log Message:
-----------
Bugfix: copying a newly-created vertex group caused a crash.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/object/object_vgroup.c

Modified: trunk/blender/source/blender/editors/object/object_vgroup.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_vgroup.c	2010-06-07 18:20:59 UTC (rev 29315)
+++ trunk/blender/source/blender/editors/object/object_vgroup.c	2010-06-07 18:50:19 UTC (rev 29316)
@@ -129,17 +129,8 @@
 			case ID_ME:
 			{
 				Mesh *me = (Mesh *)id;
-				*dvert_tot= me->totvert;
 
-				if (!me->edit_mesh) {
-					int i;
-
-					*dvert_arr= MEM_mallocN(sizeof(void*)*me->totvert, "vgroup parray from me");
-
-					for (i=0; i<me->totvert; i++) {
-						(*dvert_arr)[i] = me->dvert + i;
-					}
-				} else {
+				if(me->edit_mesh) {
 					EditMesh *em = me->edit_mesh;
 					EditVert *eve;
 					int i;
@@ -161,8 +152,20 @@
 						(*dvert_arr)[i] = CustomData_em_get(&em->vdata, eve->data, CD_MDEFORMVERT);
 					}
 
+					return 1;
 				}
-				return 1;
+				else if(me->dvert) {
+					int i;
+
+					*dvert_tot= me->totvert;
+					*dvert_arr= MEM_mallocN(sizeof(void*)*me->totvert, "vgroup parray from me");
+
+					for (i=0; i<me->totvert; i++) {
+						(*dvert_arr)[i] = me->dvert + i;
+					}
+
+					return 1;
+				}
 			}
 			case ID_LT:
 			{