[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24179] trunk/blender/source/blender/ editors/object/object_add.c: check for error that could happen when making editmode armatures

[Campbell Barton]

Revision: 24179
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24179
Author:   campbellbarton
Date:     2009-10-30 14:08:58 +0100 (Fri, 30 Oct 2009)

Log Message:
-----------
check for error that could happen when making editmode armatures

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

Modified: trunk/blender/source/blender/editors/object/object_add.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_add.c	2009-10-30 12:35:17 UTC (rev 24178)
+++ trunk/blender/source/blender/editors/object/object_add.c	2009-10-30 13:08:58 UTC (rev 24179)
@@ -525,12 +525,18 @@
 	int newob= 0;
 	
 	if ((obedit==NULL) || (obedit->type != OB_ARMATURE)) {
-		ED_object_add_type(C, OB_ARMATURE);
+		obedit= ED_object_add_type(C, OB_ARMATURE);
 		ED_object_enter_editmode(C, 0);
+		obedit= CTX_data_edit_object(C);
 		newob = 1;
 	}
 	else DAG_id_flush_update(&obedit->id, OB_RECALC_DATA);
 	
+	if(obedit==NULL) {
+		BKE_report(op->reports, RPT_ERROR, "Cannot create editmode armature.");
+		return OPERATOR_CANCELLED;
+	}
+	
 	if(v3d) 
 		rv3d= CTX_wm_region(C)->regiondata;