[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24300] trunk/blender: Bugfixes for Adding Objects:

[Joshua Leung]

Revision: 24300
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24300
Author:   aligorith
Date:     2009-11-04 10:45:37 +0100 (Wed, 04 Nov 2009)

Log Message:
-----------
Bugfixes for Adding Objects:

* Auto enter EditMode for adding Armatures was broken
* Adding a camera no longer tries to enter editmode, even though that's invalid...

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/space_info.py
    trunk/blender/source/blender/editors/object/object_add.c
    trunk/blender/source/blender/editors/object/object_edit.c

Modified: trunk/blender/release/scripts/ui/space_info.py
===================================================================
--- trunk/blender/release/scripts/ui/space_info.py	2009-11-04 09:37:08 UTC (rev 24299)
+++ trunk/blender/release/scripts/ui/space_info.py	2009-11-04 09:45:37 UTC (rev 24300)
@@ -187,7 +187,9 @@
         layout.itemO("object.text_add", text="Text", icon='ICON_OUTLINER_OB_FONT')
 
         layout.itemS()
-
+        
+        layout.operator_context = "INVOKE_SCREEN"
+        
         layout.itemO("object.armature_add", text="Armature", icon='ICON_OUTLINER_OB_ARMATURE')
         layout.item_enumO("object.add", "type", 'LATTICE', icon='ICON_OUTLINER_OB_LATTICE')
         layout.item_enumO("object.add", "type", 'EMPTY', icon='ICON_OUTLINER_OB_EMPTY')
@@ -195,6 +197,9 @@
         layout.itemS()
 
         layout.item_enumO("object.add", "type", 'CAMERA', icon='ICON_OUTLINER_OB_CAMERA')
+        
+        layout.operator_context = "EXEC_SCREEN"
+        
         layout.item_menu_enumO("object.lamp_add", "type", 'LAMP', text="Lamp", icon='ICON_OUTLINER_OB_LAMP')
 
         layout.itemS()

Modified: trunk/blender/source/blender/editors/object/object_add.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_add.c	2009-11-04 09:37:08 UTC (rev 24299)
+++ trunk/blender/source/blender/editors/object/object_add.c	2009-11-04 09:45:37 UTC (rev 24300)
@@ -561,6 +561,7 @@
 	ot->idname= "OBJECT_OT_text_add";
 	
 	/* api callbacks */
+	ot->invoke= ED_object_add_generic_invoke;
 	ot->exec= object_add_text_exec;
 	ot->poll= ED_operator_scene_editable;
 	
@@ -579,7 +580,7 @@
 	ED_object_add_generic_get_opts(op, &view_align, &enter_editmode);
 	
 	if ((obedit==NULL) || (obedit->type != OB_ARMATURE)) {
-		obedit= ED_object_add_type(C, OB_ARMATURE, view_align, TRUE);
+		ED_object_add_type(C, OB_ARMATURE, view_align, TRUE);
 		ED_object_enter_editmode(C, 0);
 		obedit= CTX_data_edit_object(C);
 		newob = 1;
@@ -615,6 +616,7 @@
 	ot->idname= "OBJECT_OT_armature_add";
 	
 	/* api callbacks */
+	ot->invoke= ED_object_add_generic_invoke;
 	ot->exec= object_armature_add_exec;
 	ot->poll= ED_operator_scene_editable;
 	

Modified: trunk/blender/source/blender/editors/object/object_edit.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_edit.c	2009-11-04 09:37:08 UTC (rev 24299)
+++ trunk/blender/source/blender/editors/object/object_edit.c	2009-11-04 09:45:37 UTC (rev 24300)
@@ -471,6 +471,7 @@
 	}
 	else {
 		scene->obedit= NULL; // XXX for context
+		ob->mode &= ~OB_MODE_EDIT;
 		WM_event_add_notifier(C, NC_SCENE|ND_MODE|NS_MODE_OBJECT, scene);
 	}