diff options
author | Ton Roosendaal <ton@blender.org> | 2008-12-26 14:11:21 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2008-12-26 14:11:21 +0300 |
commit | 5006875f53114b248f54a23ffb4fe88d14e7e654 (patch) | |
tree | 667382f192baae7f88ad38bf1b51f223cb8d98da /source/blender | |
parent | 34baf51dcb730319a2cbb807f905571475b24e9a (diff) |
2.5
- fix Makefile for space_script
- renamed operators for modules i maintain. (stripped ED_)
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/editors/object/object_edit.c | 8 | ||||
-rw-r--r-- | source/blender/editors/object/object_intern.h | 4 | ||||
-rw-r--r-- | source/blender/editors/object/object_ops.c | 10 | ||||
-rw-r--r-- | source/blender/editors/screen/screen_ops.c | 116 | ||||
-rw-r--r-- | source/blender/editors/space_outliner/outliner.c | 4 | ||||
-rw-r--r-- | source/blender/editors/space_outliner/outliner_intern.h | 2 | ||||
-rw-r--r-- | source/blender/editors/space_outliner/outliner_ops.c | 4 | ||||
-rw-r--r-- | source/blender/editors/space_script/Makefile | 1 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_edit.c | 28 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_header.c | 10 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_intern.h | 20 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_ops.c | 82 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_select.c | 12 |
13 files changed, 151 insertions, 150 deletions
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index 8a8f93a8290..6d5997e4a2a 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -952,13 +952,13 @@ static int clear_parent_exec(bContext *C, wmOperator *op) 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 @@ static int make_parent_invoke(bContext *C, wmOperator *op, wmEvent *event) } -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; diff --git a/source/blender/editors/object/object_intern.h b/source/blender/editors/object/object_intern.h index 5bd5c26c0f9..adbf459429f 100644 --- a/source/blender/editors/object/object_intern.h +++ b/source/blender/editors/object/object_intern.h @@ -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 */ diff --git a/source/blender/editors/object/object_ops.c b/source/blender/editors/object/object_ops.c index 99e49d5c4e3..c4f112036e9 100644 --- a/source/blender/editors/object/object_ops.c +++ b/source/blender/editors/object/object_ops.c @@ -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 @@ void ED_keymap_object(wmWindowManager *wm) { 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); } diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index 0f94184bfaa..82445cbb1fd 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -223,11 +223,11 @@ static int actionzone_modal(bContext *C, wmOperator *op, wmEvent *event) 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 @@ static int screen_area_rip_op(bContext *C, wmOperator *op) 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 @@ static int area_move_modal(bContext *C, wmOperator *op, wmEvent *event) 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 @@ static EnumPropertyItem prop_direction_items[] = { {'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 @@ static int frame_offset_exec(bContext *C, wmOperator *op) 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 @@ static int screen_set_exec(bContext *C, wmOperator *op) 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 @@ static int screen_full_area_exec(bContext *C, wmOperator *op) 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 @@ static int area_join_modal(bContext *C, wmOperator *op, wmEvent *event) } /* 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 @@ static int repeat_last_exec(bContext *C, wmOperator *op) 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 @@ static int region_split_exec(bContext *C, wmOperator *op) 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 @@ static int region_flip_exec(bContext *C, wmOperator *op) 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 @@ static int screen_animation_play(bContext *C, wmOperator *op, wmEvent *event) 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 @@ static int border_select_do(bContext *C, wmOperator *op) 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_SCR_OT_border_select(wmOperatorType *ot) 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 @@ void ED_keymap_screen(wmWindowManager *wm) { 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); + WM_keymap_verify_item(keymap, "SCREEN_OT_area_move", LEFTMOUSE, KM_PRESS, 0, 0); + WM_keymap_verify_item(keymap, "SCREEN_OT_area_split", EVT_ACTIONZONE, 0, 0, 0); /* action tria */ + WM_keymap_verify_item(keymap, "SCREEN_OT_area_join", EVT_ACTIONZONE, 0, 0, 0); /* action tria */ + WM_keymap_verify_item(keymap, "SCREEN_OT_area_rip", RKEY, KM_PRESS, KM_ALT, 0); + RNA_int_set(WM_keymap_add_item(keymap, "SCREEN_OT_screen_set", RIGHTARROWKEY, KM_PRESS, KM_CTRL, 0)->ptr, "delta", 1); + RNA_int_set(WM_keymap_add_item(keymap, "SCREEN_OT_screen_set", LEFTARROWKEY, KM_PRESS, KM_CTRL, 0)->ptr, "delta", -1); + WM_keymap_add_item(keymap, "SCREEN_OT_screen_full_area", UPARROWKEY, KM_PRESS, KM_CTRL, 0); + WM_keymap_add_item(keymap, "SCREEN_OT_screen_full_area", DOWNARROWKEY, KM_PRESS, KM_CTRL, 0); + WM_keymap_add_item(keymap, "SCREEN_OT_screen_full_area", SPACEKEY, KM_PRESS, KM_CTRL, 0); /* tests */ - RNA_enum_set(WM_keymap_add_item(keymap, "ED_SCR_OT_region_split", SKEY, KM_PRESS, 0, 0)->ptr, "dir", 'h'); - RNA_enum_set(WM_keymap_add_item(keymap, "ED_SCR_OT_region_split", SKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "dir", 'v'); + RNA_enum_set(WM_keymap_add_item(keymap, "SCREEN_OT_region_split", SKEY, KM_PRESS, 0, 0)->ptr, "dir", 'h'); + RNA_enum_set(WM_keymap_add_item(keymap, "SCREEN_OT_region_split", SKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "dir", 'v'); /*frame offsets*/ - WM_keymap_add_item(keymap, "ED_SCR_OT_animation_play", TIMER, KM_ANY, KM_ANY, 0); - RNA_int_set(WM_keymap_add_item(keymap, "ED_SCR_OT_frame_offset", UPARROWKEY, KM_PRESS, 0, 0)->ptr, "delta", 10); - RNA_int_set(WM_keymap_add_item(keymap, "ED_SCR_OT_frame_offset", DOWNARROWKEY, KM_PRESS, 0, 0)->ptr, "delta", -10); - RNA_int_set(WM_keymap_add_item(keymap, "ED_SCR_OT_frame_offset", LEFTARROWKEY, KM_PRESS, 0, 0)->ptr, "delta", -1); - RNA_int_set(WM_keymap_add_item(keymap, "ED_SCR_OT_frame_offset", RIGHTARROWKEY, KM_PRESS, 0, 0)->ptr, "delta", 1); - - WM_keymap_add_item(keymap, "ED_SCR_OT_region_flip", F5KEY, KM_PRESS, 0, 0); - WM_keymap_verify_item(keymap, "ED_SCR_OT_repeat_last", F4KEY, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, "SCREEN_OT_animation_play", TIMER, KM_ANY, KM_ANY, 0); + RNA_int_set(WM_keymap_add_item(keymap, "SCREEN_OT_frame_offset", UPARROWKEY, KM_PRESS, 0, 0)->ptr, "delta", 10); + RNA_int_set(WM_keymap_add_item(keymap, "SCREEN_OT_frame_offset", DOWNARROWKEY, KM_PRESS, 0, 0)->ptr, "delta", -10); + RNA_int_set(WM_keymap_add_item(keymap, "SCREEN_OT_frame_offset", LEFTARROWKEY, KM_PRESS, 0, 0)->ptr, "delta", -1); + RNA_int_set(WM_keymap_add_item(keymap, "SCREEN_OT_frame_offset", RIGHTARROWKEY, KM_PRESS, 0, 0)->ptr, "delta", 1); + + WM_keymap_add_item(keymap, "SCREEN_OT_region_flip", F5KEY, KM_PRESS, 0, 0); + WM_keymap_verify_item(keymap, "SCREEN_OT_repeat_last", F4KEY, KM_PRESS, 0, 0); /* screen level global keymaps */ // err... 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); } diff --git a/source/blender/editors/space_script/Makefile b/source/blender/editors/space_script/Makefile index 4d5d3e54167..48e1cd8e861 100644 --- a/source/blender/editors/space_script/Makefile +++ b/source/blender/editors/space_script/Makefile @@ -44,6 +44,7 @@ CPPFLAGS += -I../../blenloader CPPFLAGS += -I../../blenkernel CPPFLAGS += -I../../blenlib CPPFLAGS += -I../../makesdna +CPPFLAGS += -I../../makesrna CPPFLAGS += -I../../imbuf CPPFLAGS += -I../../python CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index c1a2a9299fd..75abc27ce73 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -397,12 +397,12 @@ static int viewrotate_invoke(bContext *C, wmOperator *op, wmEvent *event) } -void ED_VIEW3D_OT_viewrotate(wmOperatorType *ot) +void VIEW3D_OT_viewrotate(wmOperatorType *ot) { /* identifiers */ ot->name= "Rotate view"; - ot->idname= "ED_VIEW3D_OT_viewrotate"; + ot->idname= "VIEW3D_OT_viewrotate"; /* api callbacks */ ot->invoke= viewrotate_invoke; @@ -472,12 +472,12 @@ static int viewmove_invoke(bContext *C, wmOperator *op, wmEvent *event) } -void ED_VIEW3D_OT_viewmove(wmOperatorType *ot) +void VIEW3D_OT_viewmove(wmOperatorType *ot) { /* identifiers */ ot->name= "Rotate view"; - ot->idname= "ED_VIEW3D_OT_viewmove"; + ot->idname= "VIEW3D_OT_viewmove"; /* api callbacks */ ot->invoke= viewmove_invoke; @@ -657,12 +657,12 @@ static int viewzoom_invoke(bContext *C, wmOperator *op, wmEvent *event) } -void ED_VIEW3D_OT_viewzoom(wmOperatorType *ot) +void VIEW3D_OT_viewzoom(wmOperatorType *ot) { /* identifiers */ ot->name= "Rotate view"; - ot->idname= "ED_VIEW3D_OT_viewzoom"; + ot->idname= "VIEW3D_OT_viewzoom"; /* api callbacks */ ot->invoke= viewzoom_invoke; @@ -745,12 +745,12 @@ static int viewhome_exec(bContext *C, wmOperator *op) /* was view3d_home() in 2. return OPERATOR_FINISHED; } -void ED_VIEW3D_OT_viewhome(wmOperatorType *ot) +void VIEW3D_OT_viewhome(wmOperatorType *ot) { /* identifiers */ ot->name= "View home"; - ot->idname= "ED_VIEW3D_OT_viewhome"; + ot->idname= "VIEW3D_OT_viewhome"; /* api callbacks */ ot->exec= viewhome_exec; @@ -881,12 +881,12 @@ static int viewcenter_exec(bContext *C, wmOperator *op) /* like a localview with return OPERATOR_FINISHED; } -void ED_VIEW3D_OT_viewcenter(wmOperatorType *ot) +void VIEW3D_OT_viewcenter(wmOperatorType *ot) { /* identifiers */ ot->name= "View center"; - ot->idname= "ED_VIEW3D_OT_viewcenter"; + ot->idname= "VIEW3D_OT_viewcenter"; /* api callbacks */ ot->exec= viewcenter_exec; @@ -1137,14 +1137,14 @@ static int viewnumpad_exec(bContext *C, wmOperator *op) } -void ED_VIEW3D_OT_viewnumpad(wmOperatorType *ot) +void VIEW3D_OT_viewnumpad(wmOperatorType *ot) { PropertyRNA *prop; /* identifiers */ ot->name= "View numpad"; - ot->idname= "ED_VIEW3D_OT_viewnumpad"; + ot->idname= "VIEW3D_OT_viewnumpad"; /* api callbacks */ ot->exec= viewnumpad_exec; @@ -1238,12 +1238,12 @@ static int view3d_clipping_invoke(bContext *C, wmOperator *op, wmEvent *event) } /* toggles */ -void ED_VIEW3D_OT_clipping(wmOperatorType *ot) +void VIEW3D_OT_clipping(wmOperatorType *ot) { /* identifiers */ ot->name= "Border Select"; - ot->idname= "ED_VIEW3D_OT_clipping"; + ot->idname= "VIEW3D_OT_clipping"; /* api callbacks */ ot->invoke= view3d_clipping_invoke; diff --git a/source/blender/editors/space_view3d/view3d_header.c b/source/blender/editors/space_view3d/view3d_header.c index 32425b59d7b..3cd2e464321 100644 --- a/source/blender/editors/space_view3d/view3d_header.c +++ b/source/blender/editors/space_view3d/view3d_header.c @@ -461,7 +461,7 @@ static void do_view3d_view_alignviewmenu(bContext *C, void *arg, int event) // XXX mainqenter(PADASTERKEY, 1); break; case 6: /* Center View and Cursor to Origin */ - WM_operator_name_call(C, "ED_VIEW3D_OT_viewcenter", WM_OP_REGION_WIN, NULL); + WM_operator_name_call(C, "VIEW3D_OT_viewcenter", WM_OP_REGION_WIN, NULL); curs= give_cursor(scene, v3d); curs[0]=curs[1]=curs[2]= 0.0; break; @@ -545,10 +545,10 @@ static void do_view3d_viewmenu(bContext *C, void *arg, int event) endlocalview(scene, sa); break; case 9: /* View All (Home) */ - WM_operator_name_call(C, "ED_VIEW3D_OT_viewhome", WM_OP_REGION_WIN, NULL); + WM_operator_name_call(C, "VIEW3D_OT_viewhome", WM_OP_REGION_WIN, NULL); break; case 11: /* View Selected */ - WM_operator_name_call(C, "ED_VIEW3D_OT_viewcenter", WM_OP_REGION_WIN, NULL); + WM_operator_name_call(C, "VIEW3D_OT_viewcenter", WM_OP_REGION_WIN, NULL); break; case 13: /* Play Back Animation */ play_anim(0); @@ -560,7 +560,7 @@ static void do_view3d_viewmenu(bContext *C, void *arg, int event) add_blockhandler(sa, VIEW3D_HANDLER_PROPERTIES, UI_PNL_UNSTOW); break; case 17: /* Set Clipping Border */ - WM_operator_name_call(C, "ED_VIEW3D_OT_clipping", WM_OP_REGION_WIN, NULL); + WM_operator_name_call(C, "VIEW3D_OT_clipping", WM_OP_REGION_WIN, NULL); break; case 18: /* render preview */ toggle_blockhandler(sa, VIEW3D_HANDLER_PREVIEW, 0); @@ -5325,7 +5325,7 @@ static void do_view3d_buttons(bContext *C, void *arg, int event) switch(event) { case B_HOME: - WM_operator_name_call(C, "ED_VIEW3D_OT_viewhome", WM_OP_REGION_WIN, NULL); + WM_operator_name_call(C, "VIEW3D_OT_viewhome", WM_OP_REGION_WIN, NULL); break; case B_SCENELOCK: if(v3d->scenelock) { diff --git a/source/blender/editors/space_view3d/view3d_intern.h b/source/blender/editors/space_view3d/view3d_intern.h index b4a024dfdf4..cb3ccf4b5df 100644 --- a/source/blender/editors/space_view3d/view3d_intern.h +++ b/source/blender/editors/space_view3d/view3d_intern.h @@ -70,13 +70,13 @@ void view3d_operatortypes(void); void view3d_keymap(struct wmWindowManager *wm); /* view3d_edit.c */ -void ED_VIEW3D_OT_viewzoom(struct wmOperatorType *ot); -void ED_VIEW3D_OT_viewmove(struct wmOperatorType *ot); -void ED_VIEW3D_OT_viewrotate(struct wmOperatorType *ot); -void ED_VIEW3D_OT_viewhome(struct wmOperatorType *ot); -void ED_VIEW3D_OT_viewnumpad(struct wmOperatorType *ot); -void ED_VIEW3D_OT_viewcenter(struct wmOperatorType *ot); -void ED_VIEW3D_OT_clipping(struct wmOperatorType *ot); +void VIEW3D_OT_viewzoom(struct wmOperatorType *ot); +void VIEW3D_OT_viewmove(struct wmOperatorType *ot); +void VIEW3D_OT_viewrotate(struct wmOperatorType *ot); +void VIEW3D_OT_viewhome(struct wmOperatorType *ot); +void VIEW3D_OT_viewnumpad(struct wmOperatorType *ot); +void VIEW3D_OT_viewcenter(struct wmOperatorType *ot); +void VIEW3D_OT_clipping(struct wmOperatorType *ot); /* drawobject.c */ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag); @@ -111,9 +111,9 @@ void circ(float x, float y, float rad); void view3d_update_depths(ARegion *ar, View3D *v3d); /* view3d_select.c */ -void ED_VIEW3D_OT_select(struct wmOperatorType *ot); -void ED_VIEW3D_OT_borderselect(struct wmOperatorType *ot); -void ED_VIEW3D_OT_circle_select(struct wmOperatorType *ot); +void VIEW3D_OT_select(struct wmOperatorType *ot); +void VIEW3D_OT_borderselect(struct wmOperatorType *ot); +void VIEW3D_OT_circle_select(struct wmOperatorType *ot); /* view3d_view.c */ void view3d_operator_needs_opengl(const struct bContext *C); diff --git a/source/blender/editors/space_view3d/view3d_ops.c b/source/blender/editors/space_view3d/view3d_ops.c index d65d1186efb..c014ab1dc5f 100644 --- a/source/blender/editors/space_view3d/view3d_ops.c +++ b/source/blender/editors/space_view3d/view3d_ops.c @@ -61,57 +61,57 @@ void view3d_operatortypes(void) { - WM_operatortype_append(ED_VIEW3D_OT_viewrotate); - WM_operatortype_append(ED_VIEW3D_OT_viewmove); - WM_operatortype_append(ED_VIEW3D_OT_viewzoom); - WM_operatortype_append(ED_VIEW3D_OT_viewhome); - WM_operatortype_append(ED_VIEW3D_OT_viewnumpad); - WM_operatortype_append(ED_VIEW3D_OT_viewcenter); - WM_operatortype_append(ED_VIEW3D_OT_select); - WM_operatortype_append(ED_VIEW3D_OT_borderselect); - WM_operatortype_append(ED_VIEW3D_OT_clipping); - WM_operatortype_append(ED_VIEW3D_OT_circle_select); + WM_operatortype_append(VIEW3D_OT_viewrotate); + WM_operatortype_append(VIEW3D_OT_viewmove); + WM_operatortype_append(VIEW3D_OT_viewzoom); + WM_operatortype_append(VIEW3D_OT_viewhome); + WM_operatortype_append(VIEW3D_OT_viewnumpad); + WM_operatortype_append(VIEW3D_OT_viewcenter); + WM_operatortype_append(VIEW3D_OT_select); + WM_operatortype_append(VIEW3D_OT_borderselect); + WM_operatortype_append(VIEW3D_OT_clipping); + WM_operatortype_append(VIEW3D_OT_circle_select); } void view3d_keymap(wmWindowManager *wm) { ListBase *keymap= WM_keymap_listbase(wm, "View3D", SPACE_VIEW3D, 0); - WM_keymap_verify_item(keymap, "ED_VIEW3D_OT_viewrotate", MIDDLEMOUSE, KM_PRESS, 0, 0); - WM_keymap_verify_item(keymap, "ED_VIEW3D_OT_viewmove", MIDDLEMOUSE, KM_PRESS, KM_SHIFT, 0); - WM_keymap_verify_item(keymap, "ED_VIEW3D_OT_viewzoom", MIDDLEMOUSE, KM_PRESS, KM_CTRL, 0); - WM_keymap_verify_item(keymap, "ED_VIEW3D_OT_viewcenter", PADPERIOD, KM_PRESS, 0, 0); + WM_keymap_verify_item(keymap, "VIEW3D_OT_viewrotate", MIDDLEMOUSE, KM_PRESS, 0, 0); + WM_keymap_verify_item(keymap, "VIEW3D_OT_viewmove", MIDDLEMOUSE, KM_PRESS, KM_SHIFT, 0); + WM_keymap_verify_item(keymap, "VIEW3D_OT_viewzoom", MIDDLEMOUSE, KM_PRESS, KM_CTRL, 0); + WM_keymap_verify_item(keymap, "VIEW3D_OT_viewcenter", PADPERIOD, KM_PRESS, 0, 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, "ED_VIEW3D_OT_viewzoom", PADMINUS, KM_PRESS, 0, 0)->ptr, "delta", -1); - RNA_int_set(WM_keymap_add_item(keymap, "ED_VIEW3D_OT_viewzoom", WHEELUPMOUSE, KM_ANY, 0, 0)->ptr, "delta", 1); - RNA_int_set(WM_keymap_add_item(keymap, "ED_VIEW3D_OT_viewzoom", WHEELDOWNMOUSE, KM_ANY, 0, 0)->ptr, "delta", -1); + RNA_int_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewzoom", PADPLUSKEY, KM_PRESS, 0, 0)->ptr, "delta", 1); + RNA_int_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewzoom", PADMINUS, KM_PRESS, 0, 0)->ptr, "delta", -1); + RNA_int_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewzoom", WHEELUPMOUSE, KM_ANY, 0, 0)->ptr, "delta", 1); + RNA_int_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewzoom", WHEELDOWNMOUSE, KM_ANY, 0, 0)->ptr, "delta", -1); - RNA_boolean_set(WM_keymap_add_item(keymap, "ED_VIEW3D_OT_viewhome", HOMEKEY, KM_PRESS, 0, 0)->ptr, "center", 0); - RNA_boolean_set(WM_keymap_add_item(keymap, "ED_VIEW3D_OT_viewhome", CKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "center", 1); + RNA_boolean_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewhome", HOMEKEY, KM_PRESS, 0, 0)->ptr, "center", 0); + RNA_boolean_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewhome", CKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "center", 1); /* numpad view hotkeys*/ - RNA_enum_set(WM_keymap_add_item(keymap, "ED_VIEW3D_OT_viewnumpad", PAD0, KM_PRESS, 0, 0)->ptr, "viewnum", V3D_VIEW_CAMERA); - RNA_enum_set(WM_keymap_add_item(keymap, "ED_VIEW3D_OT_viewnumpad", PAD1, KM_PRESS, 0, 0)->ptr, "viewnum", V3D_VIEW_FRONT); - RNA_enum_set(WM_keymap_add_item(keymap, "ED_VIEW3D_OT_viewnumpad", PAD2, KM_PRESS, 0, 0)->ptr, "viewnum", V3D_VIEW_STEPDOWN); - RNA_enum_set(WM_keymap_add_item(keymap, "ED_VIEW3D_OT_viewnumpad", PAD3, KM_PRESS, 0, 0)->ptr, "viewnum", V3D_VIEW_RIGHT); - RNA_enum_set(WM_keymap_add_item(keymap, "ED_VIEW3D_OT_viewnumpad", PAD4, KM_PRESS, 0, 0)->ptr, "viewnum", V3D_VIEW_STEPLEFT); - RNA_enum_set(WM_keymap_add_item(keymap, "ED_VIEW3D_OT_viewnumpad", PAD5, KM_PRESS, 0, 0)->ptr, "viewnum", V3D_VIEW_PERSPORTHO); - RNA_enum_set(WM_keymap_add_item(keymap, "ED_VIEW3D_OT_viewnumpad", PAD6, KM_PRESS, 0, 0)->ptr, "viewnum", V3D_VIEW_STEPRIGHT); - RNA_enum_set(WM_keymap_add_item(keymap, "ED_VIEW3D_OT_viewnumpad", PAD7, KM_PRESS, 0, 0)->ptr, "viewnum", V3D_VIEW_TOP); - RNA_enum_set(WM_keymap_add_item(keymap, "ED_VIEW3D_OT_viewnumpad", PAD8, KM_PRESS, 0, 0)->ptr, "viewnum", V3D_VIEW_STEPUP); - RNA_enum_set(WM_keymap_add_item(keymap, "ED_VIEW3D_OT_viewnumpad", PAD1, KM_PRESS, KM_CTRL, 0)->ptr, "viewnum", V3D_VIEW_BACK); - RNA_enum_set(WM_keymap_add_item(keymap, "ED_VIEW3D_OT_viewnumpad", PAD3, KM_PRESS, KM_CTRL, 0)->ptr, "viewnum", V3D_VIEW_LEFT); - RNA_enum_set(WM_keymap_add_item(keymap, "ED_VIEW3D_OT_viewnumpad", PAD7, KM_PRESS, KM_CTRL, 0)->ptr, "viewnum", V3D_VIEW_BOTTOM); - RNA_enum_set(WM_keymap_add_item(keymap, "ED_VIEW3D_OT_viewnumpad", PAD2, KM_PRESS, KM_CTRL, 0)->ptr, "viewnum", V3D_VIEW_PANDOWN); - RNA_enum_set(WM_keymap_add_item(keymap, "ED_VIEW3D_OT_viewnumpad", PAD4, KM_PRESS, KM_CTRL, 0)->ptr, "viewnum", V3D_VIEW_PANLEFT); - RNA_enum_set(WM_keymap_add_item(keymap, "ED_VIEW3D_OT_viewnumpad", PAD6, KM_PRESS, KM_CTRL, 0)->ptr, "viewnum", V3D_VIEW_PANRIGHT); - RNA_enum_set(WM_keymap_add_item(keymap, "ED_VIEW3D_OT_viewnumpad", PAD8, KM_PRESS, KM_CTRL, 0)->ptr, "viewnum", V3D_VIEW_PANUP); - - WM_keymap_add_item(keymap, "ED_VIEW3D_OT_select", SELECTMOUSE, KM_PRESS, 0, 0); - WM_keymap_add_item(keymap, "ED_VIEW3D_OT_borderselect", BKEY, KM_PRESS, 0, 0); - WM_keymap_add_item(keymap, "ED_VIEW3D_OT_clipping", BKEY, KM_PRESS, KM_ALT, 0); - WM_keymap_add_item(keymap, "ED_VIEW3D_OT_circle_select", CKEY, KM_PRESS, 0, 0); + RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewnumpad", PAD0, KM_PRESS, 0, 0)->ptr, "viewnum", V3D_VIEW_CAMERA); + RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewnumpad", PAD1, KM_PRESS, 0, 0)->ptr, "viewnum", V3D_VIEW_FRONT); + RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewnumpad", PAD2, KM_PRESS, 0, 0)->ptr, "viewnum", V3D_VIEW_STEPDOWN); + RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewnumpad", PAD3, KM_PRESS, 0, 0)->ptr, "viewnum", V3D_VIEW_RIGHT); + RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewnumpad", PAD4, KM_PRESS, 0, 0)->ptr, "viewnum", V3D_VIEW_STEPLEFT); + RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewnumpad", PAD5, KM_PRESS, 0, 0)->ptr, "viewnum", V3D_VIEW_PERSPORTHO); + RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewnumpad", PAD6, KM_PRESS, 0, 0)->ptr, "viewnum", V3D_VIEW_STEPRIGHT); + RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewnumpad", PAD7, KM_PRESS, 0, 0)->ptr, "viewnum", V3D_VIEW_TOP); + RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewnumpad", PAD8, KM_PRESS, 0, 0)->ptr, "viewnum", V3D_VIEW_STEPUP); + RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewnumpad", PAD1, KM_PRESS, KM_CTRL, 0)->ptr, "viewnum", V3D_VIEW_BACK); + RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewnumpad", PAD3, KM_PRESS, KM_CTRL, 0)->ptr, "viewnum", V3D_VIEW_LEFT); + RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewnumpad", PAD7, KM_PRESS, KM_CTRL, 0)->ptr, "viewnum", V3D_VIEW_BOTTOM); + RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewnumpad", PAD2, KM_PRESS, KM_CTRL, 0)->ptr, "viewnum", V3D_VIEW_PANDOWN); + RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewnumpad", PAD4, KM_PRESS, KM_CTRL, 0)->ptr, "viewnum", V3D_VIEW_PANLEFT); + RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewnumpad", PAD6, KM_PRESS, KM_CTRL, 0)->ptr, "viewnum", V3D_VIEW_PANRIGHT); + RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewnumpad", PAD8, KM_PRESS, KM_CTRL, 0)->ptr, "viewnum", V3D_VIEW_PANUP); + + WM_keymap_add_item(keymap, "VIEW3D_OT_select", SELECTMOUSE, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, "VIEW3D_OT_borderselect", BKEY, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, "VIEW3D_OT_clipping", BKEY, KM_PRESS, KM_ALT, 0); + WM_keymap_add_item(keymap, "VIEW3D_OT_circle_select", CKEY, KM_PRESS, 0, 0); /* TODO - this is just while we have no way to load a text datablock */ RNA_string_set(WM_keymap_add_item(keymap, "ED_SCRIPT_OT_run_pyfile", PKEY, KM_PRESS, 0, 0)->ptr, "filename", "test.py"); diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c index 69bcf2e0395..1d1bef89d20 100644 --- a/source/blender/editors/space_view3d/view3d_select.c +++ b/source/blender/editors/space_view3d/view3d_select.c @@ -1294,12 +1294,12 @@ static int view3d_select_invoke(bContext *C, wmOperator *op, wmEvent *event) return OPERATOR_FINISHED; } -void ED_VIEW3D_OT_select(wmOperatorType *ot) +void VIEW3D_OT_select(wmOperatorType *ot) { /* identifiers */ ot->name= "Activate/Select"; - ot->idname= "ED_VIEW3D_OT_select"; + ot->idname= "VIEW3D_OT_select"; /* api callbacks */ ot->invoke= view3d_select_invoke; @@ -1659,12 +1659,12 @@ static int view3d_borderselect_exec(bContext *C, wmOperator *op) } -void ED_VIEW3D_OT_borderselect(wmOperatorType *ot) +void VIEW3D_OT_borderselect(wmOperatorType *ot) { /* identifiers */ ot->name= "Border Select"; - ot->idname= "ED_VIEW3D_OT_borderselect"; + ot->idname= "VIEW3D_OT_borderselect"; /* api callbacks */ ot->invoke= WM_border_select_invoke; @@ -1887,10 +1887,10 @@ static int view3d_circle_select(bContext *C, wmOperator *op) return 0; } -void ED_VIEW3D_OT_circle_select(wmOperatorType *ot) +void VIEW3D_OT_circle_select(wmOperatorType *ot) { ot->name= "Circle Select"; - ot->idname= "ED_VIEW3D_OT_circle_select"; + ot->idname= "VIEW3D_OT_circle_select"; ot->invoke= WM_gesture_circle_invoke; ot->modal= WM_gesture_circle_modal; |