[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34105] trunk/blender/source/blender/ editors: Bugfix, irc report:

[Ton Roosendaal]

Revision: 34105
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=34105
Author:   ton
Date:     2011-01-05 19:12:54 +0100 (Wed, 05 Jan 2011)

Log Message:
-----------
Bugfix, irc report:

Outliner: using the object-data icons to enter editmode, didn't
reset the toolbar Operator redo. It was not using an operator
call here. Note to self: more outliner tools don't...

Error was that operator-redo then would repeat an action incorrect.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/object/object_edit.c
    trunk/blender/source/blender/editors/space_outliner/outliner.c

Modified: trunk/blender/source/blender/editors/object/object_edit.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_edit.c	2011-01-05 17:27:26 UTC (rev 34104)
+++ trunk/blender/source/blender/editors/object/object_edit.c	2011-01-05 18:12:54 UTC (rev 34105)
@@ -523,6 +523,9 @@
 	/* covers proxies too */
 	if(ELEM(NULL, ob, ob->data) || ((ID *)ob->data)->lib)
 		return 0;
+	
+	if (ob && (ob->restrictflag & OB_RESTRICT_VIEW))
+		return 0;
 
 	return ob && (ob->type == OB_MESH || ob->type == OB_ARMATURE ||
 			  ob->type == OB_FONT || ob->type == OB_MBALL ||

Modified: trunk/blender/source/blender/editors/space_outliner/outliner.c
===================================================================
--- trunk/blender/source/blender/editors/space_outliner/outliner.c	2011-01-05 17:27:26 UTC (rev 34104)
+++ trunk/blender/source/blender/editors/space_outliner/outliner.c	2011-01-05 18:12:54 UTC (rev 34105)
@@ -2496,19 +2496,7 @@
 					WM_event_add_notifier(C, NC_SCENE|ND_OB_SELECT, scene);
 				}
 				else if(ELEM5(te->idcode, ID_ME, ID_CU, ID_MB, ID_LT, ID_AR)) {
-					Object *obedit= CTX_data_edit_object(C);
-					if(obedit) 
-						ED_object_exit_editmode(C, EM_FREEDATA|EM_FREEUNDO|EM_WAITCURSOR|EM_DO_UNDO);
-					else {
-						Object *ob= CTX_data_active_object(C);
-
-						/* Don't allow edit mode if the object is hide!
-						 * check the bug #22153 and #21609
-						 */
-						if (ob && (!(ob->restrictflag & OB_RESTRICT_VIEW)))
-							ED_object_enter_editmode(C, EM_WAITCURSOR);
-						// XXX extern_set_butspace(F9KEY, 0);
-					}
+					WM_operator_name_call(C, "OBJECT_OT_editmode_toggle", WM_OP_INVOKE_REGION_WIN, NULL);
 				} else {	// rest of types
 					tree_element_active(C, scene, soops, te, 1);
 				}