[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53085] trunk/blender/source/blender: Bug fix, IRC report.

[Ton Roosendaal]

Revision: 53085
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53085
Author:   ton
Date:     2012-12-17 14:51:06 +0000 (Mon, 17 Dec 2012)
Log Message:
-----------
Bug fix, IRC report.

With 2 windows, 2 scenes, linked objects:
- enter editmode in 1 window.
- the other window allowed to enter editmode too.
- and crash happened on exit editmode.

Since editmode is in Context (scene->obedit) a bad conflict arises.

New function BKE_object_is_in_editmode() returns this info outside of
context. Note I didn't use BMEdit_FromObject() because of the assert().

NOTE: contextual storage of editmode could need rework... five places:
- ob->mode / ob->restore_mode
- scene->object
- CTX_data_edit_object()
- BKE_object_is_in_editmode()
- view3d mode handling menu

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/BKE_object.h
    trunk/blender/source/blender/blenkernel/intern/object.c
    trunk/blender/source/blender/editors/object/object_edit.c

Modified: trunk/blender/source/blender/blenkernel/BKE_object.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_object.h	2012-12-17 12:35:39 UTC (rev 53084)
+++ trunk/blender/source/blender/blenkernel/BKE_object.h	2012-12-17 14:51:06 UTC (rev 53085)
@@ -76,7 +76,8 @@
 
 void BKE_object_unlink(struct Object *ob);
 int  BKE_object_exists_check(struct Object *obtest);
-	
+int BKE_object_is_in_editmode(struct Object *ob);
+
 struct Object *BKE_object_add_only_object(int type, const char *name);
 struct Object *BKE_object_add(struct Scene *scene, int type);
 void *BKE_object_obdata_add_from_type(int type);

Modified: trunk/blender/source/blender/blenkernel/intern/object.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/object.c	2012-12-17 12:35:39 UTC (rev 53084)
+++ trunk/blender/source/blender/blenkernel/intern/object.c	2012-12-17 14:51:06 UTC (rev 53085)
@@ -729,6 +729,50 @@
 	}
 }
 
+/* actual check for internal data, not context or flags */
+int BKE_object_is_in_editmode(Object *ob)
+{
+	if (ob->data == NULL)
+		return 0;
+	
+	if (ob->type == OB_MESH) {
+		Mesh *me = ob->data;
+		if (me->edit_btmesh)
+			return 1;
+	}
+	else if (ob->type == OB_ARMATURE) {
+		bArmature *arm = ob->data;
+		
+		if (arm->edbo)
+			return 1;
+	}
+	else if (ob->type == OB_FONT) {
+		Curve *cu = ob->data;
+		
+		if (cu->editfont)
+			return 1;
+	}
+	else if (ob->type == OB_MBALL) {
+		MetaBall *mb = ob->data;
+		
+		if (mb->editelems)
+			return 1;
+	}
+	else if (ob->type == OB_LATTICE) {
+		Lattice *lt = ob->data;
+		
+		if (lt->editlatt)
+			return 1;
+	}
+	else if (ob->type == OB_SURF || ob->type == OB_CURVE) {
+		Curve *cu = ob->data;
+
+		if (cu->editnurb)
+			return 1;
+	}
+	return 0;
+}
+
 int BKE_object_exists_check(Object *obtest)
 {
 	Object *ob;

Modified: trunk/blender/source/blender/editors/object/object_edit.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_edit.c	2012-12-17 12:35:39 UTC (rev 53084)
+++ trunk/blender/source/blender/editors/object/object_edit.c	2012-12-17 14:51:06 UTC (rev 53085)
@@ -429,6 +429,10 @@
 
 	ob = base->object;
 
+	/* this checks actual object->data, for cases when other scenes have it in editmode context */
+	if ( BKE_object_is_in_editmode(ob) )
+		return;
+	
 	if (BKE_object_obdata_is_libdata(ob)) {
 		error_libdata();
 		return;