[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22574] branches/blender2.5/blender/source /blender/editors/object/object_edit.c: 2.5 editmode:

[Nicholas Bishop]

Revision: 22574
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22574
Author:   nicholasbishop
Date:     2009-08-17 19:26:58 +0200 (Mon, 17 Aug 2009)

Log Message:
-----------
2.5 editmode:

* Added a poll to the editmode operator that checks first that the object is an editable type (no more tabkey on camera, bug reported by DingTo)

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/object/object_edit.c

Modified: branches/blender2.5/blender/source/blender/editors/object/object_edit.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/object/object_edit.c	2009-08-17 17:26:54 UTC (rev 22573)
+++ branches/blender2.5/blender/source/blender/editors/object/object_edit.c	2009-08-17 17:26:58 UTC (rev 22574)
@@ -3859,6 +3859,16 @@
 	return OPERATOR_FINISHED;
 }
 
+static int editmode_toggle_poll(bContext *C)
+{
+	Object *ob = CTX_data_active_object(C);
+
+	return ob && (ob->type == OB_MESH || ob->type == OB_ARMATURE ||
+		      ob->type == OB_FONT || ob->type == OB_MBALL ||
+		      ob->type == OB_LATTICE || ob->type == OB_SURF ||
+		      ob->type == OB_CURVE);
+}
+
 void OBJECT_OT_editmode_toggle(wmOperatorType *ot)
 {
 	
@@ -3870,7 +3880,7 @@
 	/* api callbacks */
 	ot->exec= editmode_toggle_exec;
 	
-	ot->poll= ED_operator_object_active;
+	ot->poll= editmode_toggle_poll;
 	
 	/* flags */
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;