[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26587] trunk/blender/source/blender/ makesrna/intern/rna_scene.c: [#20957] Python API: unlink an object while in edit mode may crash Blender

[Campbell Barton]

Revision: 26587
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26587
Author:   campbellbarton
Date:     2010-02-03 20:25:43 +0100 (Wed, 03 Feb 2010)

Log Message:
-----------
[#20957] Python API: unlink an object while in edit mode may crash Blender
disallow unlinking objects if there not in object mode.

Modified Paths:
--------------
    trunk/blender/source/blender/makesrna/intern/rna_scene.c

Modified: trunk/blender/source/blender/makesrna/intern/rna_scene.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_scene.c	2010-02-03 19:16:18 UTC (rev 26586)
+++ trunk/blender/source/blender/makesrna/intern/rna_scene.c	2010-02-03 19:25:43 UTC (rev 26587)
@@ -160,6 +160,11 @@
 		BKE_report(reports, RPT_ERROR, "Object is not in this scene.");
 		return;
 	}
+	if (base==scene->basact && ob->mode != OB_MODE_OBJECT) {
+		BKE_report(reports, RPT_ERROR, "Object must be in 'Object Mode' to unlink.");
+		return;
+	}
+
 	/* as long as ED_base_object_free_and_unlink calls free_libblock_us, we don't have to decrement ob->id.us */
 	ED_base_object_free_and_unlink(scene, base);