2.5

- fix Makefile for space_script
- renamed operators for modules i maintain. (stripped ED_)

3 files changed, 5 insertions, 5 deletions

diff --git a/source/blender/editors/space_outliner/outliner.c b/source/blender/editors/space_outliner/outliner.c
index 640c89803c8..8122ac0e3aa 100644
--- a/source/blender/editors/space_outliner/outliner.c
+++ b/source/blender/editors/space_outliner/outliner.c
@@ -2148,10 +2148,10 @@ static int outliner_activate_click(bContext *C, wmOperator *op, wmEvent *event)
 	return OPERATOR_FINISHED;
 }
 
-void ED_OUTLINER_OT_activate_click(wmOperatorType *ot)
+void OUTLINER_OT_activate_click(wmOperatorType *ot)
 {
 	ot->name= "Activate Click";
-	ot->idname= "ED_OUTLINER_OT_activate_click";
+	ot->idname= "OUTLINER_OT_activate_click";
 	
 	ot->invoke= outliner_activate_click;
 	
diff --git a/source/blender/editors/space_outliner/outliner_intern.h b/source/blender/editors/space_outliner/outliner_intern.h
index a0da7d41e74..e9ed3677ee7 100644
--- a/source/blender/editors/space_outliner/outliner_intern.h
+++ b/source/blender/editors/space_outliner/outliner_intern.h
@@ -106,7 +106,7 @@ void outliner_operation_menu(struct Scene *scene, struct ARegion *ar, struct Spa
 void outliner_select(struct ARegion *ar, struct SpaceOops *so);
 void draw_outliner(const struct bContext *C);
 
-void ED_OUTLINER_OT_activate_click(struct wmOperatorType *ot);
+void OUTLINER_OT_activate_click(struct wmOperatorType *ot);
 
 #if 0
 extern void outliner_free_tree(struct ListBase *lb);
diff --git a/source/blender/editors/space_outliner/outliner_ops.c b/source/blender/editors/space_outliner/outliner_ops.c
index 786f1643b9b..7d1155cb5d7 100644
--- a/source/blender/editors/space_outliner/outliner_ops.c
+++ b/source/blender/editors/space_outliner/outliner_ops.c
@@ -43,14 +43,14 @@
 
 void outliner_operatortypes(void)
 {
-	WM_operatortype_append(ED_OUTLINER_OT_activate_click);
+	WM_operatortype_append(OUTLINER_OT_activate_click);
 }
 
 void outliner_keymap(wmWindowManager *wm)
 {
 	ListBase *keymap= WM_keymap_listbase(wm, "Outliner", SPACE_OOPS, 0);
 	
-	WM_keymap_verify_item(keymap, "ED_OUTLINER_OT_activate_click", LEFTMOUSE, KM_PRESS, 0, 0);
+	WM_keymap_verify_item(keymap, "OUTLINER_OT_activate_click", LEFTMOUSE, KM_PRESS, 0, 0);
 
 }