2.5

- Armature editmode back
- Armature pose and editmode selecting with mouse back
- Posemode only works with 3d window header now.

1 files changed, 8 insertions, 5 deletions

diff --git a/source/blender/editors/util/ed_util.c b/source/blender/editors/util/ed_util.c
index 6de980beff4..ed311e0ff0c 100644
--- a/source/blender/editors/util/ed_util.c
+++ b/source/blender/editors/util/ed_util.c
@@ -43,6 +43,7 @@
 #include "BKE_context.h"
 #include "BKE_global.h"
 
+#include "ED_armature.h"
 #include "ED_mesh.h"
 #include "ED_util.h"
 
@@ -52,12 +53,12 @@
 
 void ED_editors_exit(bContext *C)
 {
+	Object *ob= CTX_data_edit_object(C);
+	
 	/* frees all editmode undos */
 	undo_editmode_clear();
 	
-	if(CTX_data_edit_object(C)) {
-		Object *ob= CTX_data_edit_object(C);
-		
+	if(ob) {
 		if(ob->type==OB_MESH) {
 			Mesh *me= ob->data;
 			if(me->edit_mesh) {
@@ -66,7 +67,10 @@ void ED_editors_exit(bContext *C)
 				me->edit_mesh= NULL;
 			}
 		}
-		if(ob->type==OB_FONT) {
+		else if(ob->type==OB_ARMATURE) {
+			ED_armature_edit_free(ob);
+		}
+		else if(ob->type==OB_FONT) {
 			//			free_editText();
 		}
 		//		else if(ob->type==OB_MBALL) 
@@ -74,7 +78,6 @@ void ED_editors_exit(bContext *C)
 	}
 	
 	//	free_editLatt();
-	//	free_editArmature();
 	//	free_posebuf();
 	
 }