[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23974] trunk/blender: Fix #19618: invalid vertex group data could be created when

[Brecht Van Lommel]

Revision: 23974
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23974
Author:   blendix
Date:     2009-10-19 19:11:42 +0200 (Mon, 19 Oct 2009)

Log Message:
-----------
Fix #19618: invalid vertex group data could be created when
assign vertices without an existing vertex group, causing e.g.
armature modifiers to crash.

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/buttons_data_mesh.py
    trunk/blender/source/blender/editors/object/object_vgroup.c

Modified: trunk/blender/release/scripts/ui/buttons_data_mesh.py
===================================================================
--- trunk/blender/release/scripts/ui/buttons_data_mesh.py	2009-10-19 17:10:16 UTC (rev 23973)
+++ trunk/blender/release/scripts/ui/buttons_data_mesh.py	2009-10-19 17:11:42 UTC (rev 23974)
@@ -88,7 +88,7 @@
 			row = layout.row()
 			row.itemR(group, "name")
 
-		if ob.mode == 'EDIT':
+		if ob.mode == 'EDIT' and len(ob.vertex_groups) > 0:
 			row = layout.row()
 			
 			sub = row.row(align=True)

Modified: trunk/blender/source/blender/editors/object/object_vgroup.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_vgroup.c	2009-10-19 17:10:16 UTC (rev 23973)
+++ trunk/blender/source/blender/editors/object/object_vgroup.c	2009-10-19 17:11:42 UTC (rev 23974)
@@ -876,6 +876,8 @@
 	int	i, done;
 
 	dg=BLI_findlink(&ob->defbase, ob->actdef-1);
+	if(!dg)
+		return;
 
 	if(ob->type == OB_MESH) {
 		Mesh *me= ob->data;