Revision: 18070
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18070
Author: ton
Date: 2008-12-26 12:11:21 +0100 (Fri, 26 Dec 2008)
Log Message:
-----------
2.5
- fix Makefile for space_script
- renamed operators for modules i maintain. (stripped ED_)
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/editors/object/object_edit.c
branches/blender2.5/blender/source/blender/editors/object/object_intern.h
branches/blender2.5/blender/source/blender/editors/object/object_ops.c
branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c
branches/blender2.5/blender/source/blender/editors/space_outliner/outliner.c
branches/blender2.5/blender/source/blender/editors/space_outliner/outliner_intern.h
branches/blender2.5/blender/source/blender/editors/space_outliner/outliner_ops.c
branches/blender2.5/blender/source/blender/editors/space_script/Makefile
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_edit.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_header.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_intern.h
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_ops.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_select.c
Modified:
branches/blender2.5/blender/source/blender/editors/object/object_edit.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/object/object_edit.c
2008-12-26 10:55:07 UTC (rev 18069)
+++ branches/blender2.5/blender/source/blender/editors/object/object_edit.c
2008-12-26 11:11:21 UTC (rev 18070)
@@ -952,13 +952,13 @@
return OPERATOR_FINISHED;
}
-void ED_VIEW3D_OT_clear_parent(wmOperatorType *ot)
+void OBJECT_OT_clear_parent(wmOperatorType *ot)
{
PropertyRNA *prop;
/* identifiers */
ot->name= "Clear parent";
- ot->idname= "ED_VIEW3D_OT_clear_parent";
+ ot->idname= "OBJECT_OT_clear_parent";
/* api callbacks */
ot->invoke= WM_menu_invoke;
@@ -1559,13 +1559,13 @@
}
-void ED_VIEW3D_OT_make_parent(wmOperatorType *ot)
+void OBJECT_OT_make_parent(wmOperatorType *ot)
{
PropertyRNA *prop;
/* identifiers */
ot->name= "Make parent";
- ot->idname= "ED_VIEW3D_OT_make_parent";
+ ot->idname= "OBJECT_OT_make_parent";
/* api callbacks */
ot->invoke= make_parent_invoke;
Modified:
branches/blender2.5/blender/source/blender/editors/object/object_intern.h
===================================================================
--- branches/blender2.5/blender/source/blender/editors/object/object_intern.h
2008-12-26 10:55:07 UTC (rev 18069)
+++ branches/blender2.5/blender/source/blender/editors/object/object_intern.h
2008-12-26 11:11:21 UTC (rev 18070)
@@ -32,8 +32,8 @@
/* object_edit.c */
-void ED_VIEW3D_OT_make_parent(wmOperatorType *ot);
-void ED_VIEW3D_OT_clear_parent(wmOperatorType *ot);
+void OBJECT_OT_make_parent(wmOperatorType *ot);
+void OBJECT_OT_clear_parent(wmOperatorType *ot);
#endif /* ED_OBJECT_INTERN_H */
Modified: branches/blender2.5/blender/source/blender/editors/object/object_ops.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/object/object_ops.c
2008-12-26 10:55:07 UTC (rev 18069)
+++ branches/blender2.5/blender/source/blender/editors/object/object_ops.c
2008-12-26 11:11:21 UTC (rev 18070)
@@ -62,8 +62,8 @@
void ED_operatortypes_object(void)
{
- WM_operatortype_append(ED_VIEW3D_OT_make_parent);
- WM_operatortype_append(ED_VIEW3D_OT_clear_parent);
+ WM_operatortype_append(OBJECT_OT_make_parent);
+ WM_operatortype_append(OBJECT_OT_clear_parent);
}
@@ -72,9 +72,9 @@
{
ListBase *keymap= WM_keymap_listbase(wm, "View3D Object", SPACE_VIEW3D,
0);
- WM_keymap_verify_item(keymap, "ED_VIEW3D_OT_make_parent", PKEY,
KM_PRESS, KM_CTRL, 0);
- WM_keymap_verify_item(keymap, "ED_VIEW3D_OT_clear_parent", PKEY,
KM_PRESS, KM_ALT, 0);
+ WM_keymap_verify_item(keymap, "OBJECT_OT_make_parent", PKEY, KM_PRESS,
KM_CTRL, 0);
+ WM_keymap_verify_item(keymap, "OBJECT_OT_clear_parent", PKEY, KM_PRESS,
KM_ALT, 0);
-// RNA_int_set(WM_keymap_add_item(keymap, "ED_VIEW3D_OT_viewzoom",
PADPLUSKEY, KM_PRESS, 0, 0)->ptr, "delta", 1);
+// RNA_int_set(WM_keymap_add_item(keymap, "OBJECT_OT_viewzoom",
PADPLUSKEY, KM_PRESS, 0, 0)->ptr, "delta", 1);
}
Modified: branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c
2008-12-26 10:55:07 UTC (rev 18069)
+++ branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c
2008-12-26 11:11:21 UTC (rev 18070)
@@ -223,11 +223,11 @@
return OPERATOR_RUNNING_MODAL;
}
-void ED_SCR_OT_actionzone(wmOperatorType *ot)
+void SCREEN_OT_actionzone(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Handle area action zones";
- ot->idname= "ED_SCR_OT_actionzone";
+ ot->idname= "SCREEN_OT_actionzone";
ot->invoke= actionzone_invoke;
ot->modal= actionzone_modal;
@@ -275,10 +275,10 @@
return OPERATOR_FINISHED;
}
-void ED_SCR_OT_area_rip(wmOperatorType *ot)
+void SCREEN_OT_area_rip(wmOperatorType *ot)
{
ot->name= "Rip Area into New Window";
- ot->idname= "ED_SCR_OT_area_rip";
+ ot->idname= "SCREEN_OT_area_rip";
ot->invoke= WM_operator_confirm;
ot->exec= screen_area_rip_op;
@@ -506,13 +506,13 @@
return OPERATOR_RUNNING_MODAL;
}
-void ED_SCR_OT_area_move(wmOperatorType *ot)
+void SCREEN_OT_area_move(wmOperatorType *ot)
{
PropertyRNA *prop;
/* identifiers */
ot->name= "Move area edges";
- ot->idname= "ED_SCR_OT_area_move";
+ ot->idname= "SCREEN_OT_area_move";
ot->exec= area_move_exec;
ot->invoke= area_move_invoke;
@@ -815,12 +815,12 @@
{'v', "VERTICAL", "Vertical", ""},
{0, NULL, NULL, NULL}};
-void ED_SCR_OT_area_split(wmOperatorType *ot)
+void SCREEN_OT_area_split(wmOperatorType *ot)
{
PropertyRNA *prop;
ot->name = "Split area";
- ot->idname = "ED_SCR_OT_area_split";
+ ot->idname = "SCREEN_OT_area_split";
ot->exec= area_split_exec;
ot->invoke= area_split_invoke;
@@ -856,10 +856,10 @@
return OPERATOR_FINISHED;
}
-void ED_SCR_OT_frame_offset(wmOperatorType *ot)
+void SCREEN_OT_frame_offset(wmOperatorType *ot)
{
ot->name = "Frame Offset";
- ot->idname = "ED_SCR_OT_frame_offset";
+ ot->idname = "SCREEN_OT_frame_offset";
ot->exec= frame_offset_exec;
@@ -902,10 +902,10 @@
return OPERATOR_CANCELLED;
}
-void ED_SCR_OT_screen_set(wmOperatorType *ot)
+void SCREEN_OT_screen_set(wmOperatorType *ot)
{
ot->name = "Set Screen";
- ot->idname = "ED_SCR_OT_screen_set";
+ ot->idname = "SCREEN_OT_screen_set";
ot->exec= screen_set_exec;
ot->poll= ED_operator_screenactive;
@@ -925,10 +925,10 @@
return OPERATOR_FINISHED;
}
-void ED_SCR_OT_screen_full_area(wmOperatorType *ot)
+void SCREEN_OT_screen_full_area(wmOperatorType *ot)
{
ot->name = "Toggle Full Area in Screen";
- ot->idname = "ED_SCR_OT_screen_full_area";
+ ot->idname = "SCREEN_OT_screen_full_area";
ot->exec= screen_full_area_exec;
ot->poll= ED_operator_screenactive;
@@ -1191,13 +1191,13 @@
}
/* Operator for joining two areas (space types) */
-void ED_SCR_OT_area_join(wmOperatorType *ot)
+void SCREEN_OT_area_join(wmOperatorType *ot)
{
PropertyRNA *prop;
/* identifiers */
ot->name= "Join area";
- ot->idname= "ED_SCR_OT_area_join";
+ ot->idname= "SCREEN_OT_area_join";
/* api callbacks */
ot->exec= area_join_exec;
@@ -1231,11 +1231,11 @@
return OPERATOR_FINISHED;
}
-void ED_SCR_OT_repeat_last(wmOperatorType *ot)
+void SCREEN_OT_repeat_last(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Repeat Last";
- ot->idname= "ED_SCR_OT_repeat_last";
+ ot->idname= "SCREEN_OT_repeat_last";
/* api callbacks */
ot->invoke= WM_operator_confirm;
@@ -1269,13 +1269,13 @@
return OPERATOR_FINISHED;
}
-void ED_SCR_OT_region_split(wmOperatorType *ot)
+void SCREEN_OT_region_split(wmOperatorType *ot)
{
PropertyRNA *prop;
/* identifiers */
ot->name= "Split Region";
- ot->idname= "ED_SCR_OT_region_split";
+ ot->idname= "SCREEN_OT_region_split";
/* api callbacks */
ot->invoke= WM_operator_confirm;
@@ -1308,11 +1308,11 @@
return OPERATOR_FINISHED;
}
-void ED_SCR_OT_region_flip(wmOperatorType *ot)
+void SCREEN_OT_region_flip(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Flip Region";
- ot->idname= "ED_SCR_OT_region_flip";
+ ot->idname= "SCREEN_OT_region_flip";
/* api callbacks */
ot->invoke= WM_operator_confirm;
@@ -1348,11 +1348,11 @@
return OPERATOR_PASS_THROUGH;
}
-void ED_SCR_OT_animation_play(wmOperatorType *ot)
+void SCREEN_OT_animation_play(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Animation player";
- ot->idname= "ED_SCR_OT_animation_play";
+ ot->idname= "SCREEN_OT_animation_play";
/* api callbacks */
ot->invoke= screen_animation_play;
@@ -1396,11 +1396,11 @@
return 1;
}
-void ED_SCR_OT_border_select(wmOperatorType *ot)
+void SCREEN_OT_border_select(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Border select";
- ot->idname= "ED_SCR_OT_border_select";
+ ot->idname= "SCREEN_OT_border_select";
/* api callbacks */
ot->exec= border_select_do;
@@ -1425,22 +1425,22 @@
void ED_operatortypes_screen(void)
{
/* generic UI stuff */
- WM_operatortype_append(ED_SCR_OT_actionzone);
- WM_operatortype_append(ED_SCR_OT_repeat_last);
+ WM_operatortype_append(SCREEN_OT_actionzone);
+ WM_operatortype_append(SCREEN_OT_repeat_last);
/* screen tools */
- WM_operatortype_append(ED_SCR_OT_area_move);
- WM_operatortype_append(ED_SCR_OT_area_split);
- WM_operatortype_append(ED_SCR_OT_area_join);
- WM_operatortype_append(ED_SCR_OT_area_rip);
- WM_operatortype_append(ED_SCR_OT_region_split);
- WM_operatortype_append(ED_SCR_OT_region_flip);
- WM_operatortype_append(ED_SCR_OT_screen_set);
- WM_operatortype_append(ED_SCR_OT_screen_full_area);
+ WM_operatortype_append(SCREEN_OT_area_move);
+ WM_operatortype_append(SCREEN_OT_area_split);
+ WM_operatortype_append(SCREEN_OT_area_join);
+ WM_operatortype_append(SCREEN_OT_area_rip);
+ WM_operatortype_append(SCREEN_OT_region_split);
+ WM_operatortype_append(SCREEN_OT_region_flip);
+ WM_operatortype_append(SCREEN_OT_screen_set);
+ WM_operatortype_append(SCREEN_OT_screen_full_area);
/*frame changes*/
- WM_operatortype_append(ED_SCR_OT_frame_offset);
- WM_operatortype_append(ED_SCR_OT_animation_play);
+ WM_operatortype_append(SCREEN_OT_frame_offset);
+ WM_operatortype_append(SCREEN_OT_animation_play);
/* tools shared by more space types */
ED_marker_operatortypes();
@@ -1452,31 +1452,31 @@
{
ListBase *keymap= WM_keymap_listbase(wm, "Screen", 0, 0);
- WM_keymap_verify_item(keymap, "ED_SCR_OT_actionzone", LEFTMOUSE,
KM_PRESS, 0, 0);
+ WM_keymap_verify_item(keymap, "SCREEN_OT_actionzone", LEFTMOUSE,
KM_PRESS, 0, 0);
- WM_keymap_verify_item(keymap, "ED_SCR_OT_area_move", LEFTMOUSE,
KM_PRESS, 0, 0);
- WM_keymap_verify_item(keymap, "ED_SCR_OT_area_split", EVT_ACTIONZONE,
0, 0, 0); /* action tria */
- WM_keymap_verify_item(keymap, "ED_SCR_OT_area_join", EVT_ACTIONZONE, 0,
0, 0); /* action tria */
- WM_keymap_verify_item(keymap, "ED_SCR_OT_area_rip", RKEY, KM_PRESS,
KM_ALT, 0);
- RNA_int_set(WM_keymap_add_item(keymap, "ED_SCR_OT_screen_set",
RIGHTARROWKEY, KM_PRESS, KM_CTRL, 0)->ptr, "delta", 1);
- RNA_int_set(WM_keymap_add_item(keymap, "ED_SCR_OT_screen_set",
LEFTARROWKEY, KM_PRESS, KM_CTRL, 0)->ptr, "delta", -1);
- WM_keymap_add_item(keymap, "ED_SCR_OT_screen_full_area", UPARROWKEY,
KM_PRESS, KM_CTRL, 0);
- WM_keymap_add_item(keymap, "ED_SCR_OT_screen_full_area", DOWNARROWKEY,
KM_PRESS, KM_CTRL, 0);
- WM_keymap_add_item(keymap, "ED_SCR_OT_screen_full_area", SPACEKEY,
KM_PRESS, KM_CTRL, 0);
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
