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/editors/space_view3d | |
parent | 34baf51dcb730319a2cbb807f905571475b24e9a (diff) |
2.5
- fix Makefile for space_script
- renamed operators for modules i maintain. (stripped ED_)
Diffstat (limited to 'source/blender/editors/space_view3d')
-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 |
5 files changed, 76 insertions, 76 deletions
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; |