diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-09-27 14:44:46 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-09-27 14:44:46 +0400 |
| commit | 11ce49830a2d8dfff1db293f88ecd601b0f3c8c7 (patch) | |
| tree | 917f66d0df426c4a173d0dd61b59fa7cfc2b9a12 /source/blender/editors/space_view3d/view3d_edit.c | |
| parent | afa4b855caa874d32d0cd0e02524846da58628c1 (diff) | |
bugfix [#24009] Crash when switching area types and performing ops
tested every view3d operator to make sure none crash.
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_edit.c')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_edit.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index e2c12386dd3..13e5d7bbc96 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -783,7 +783,7 @@ static int view3d_camera_active_poll(bContext *C) static int view3d_rotate_poll(bContext *C) { - if (!ED_operator_view3d_active(C)) { + if (!ED_operator_region_view3d_active(C)) { return 0; } else { RegionView3D *rv3d= CTX_wm_region_view3d(C); @@ -1264,7 +1264,7 @@ void VIEW3D_OT_zoom(wmOperatorType *ot) ot->invoke= viewzoom_invoke; ot->exec= viewzoom_exec; ot->modal= viewzoom_modal; - ot->poll= ED_operator_view3d_active; + ot->poll= ED_operator_region_view3d_active; /* flags */ ot->flag= OPTYPE_BLOCKING|OPTYPE_GRAB_POINTER; @@ -1522,7 +1522,7 @@ void VIEW3D_OT_view_selected(wmOperatorType *ot) /* api callbacks */ ot->exec= viewselected_exec; - ot->poll= ED_operator_view3d_active; + ot->poll= ED_operator_region_view3d_active; /* flags */ ot->flag= 0; @@ -1822,7 +1822,7 @@ void VIEW3D_OT_zoom_border(wmOperatorType *ot) ot->exec= view3d_zoom_border_exec; ot->modal= WM_border_select_modal; - ot->poll= ED_operator_view3d_active; + ot->poll= ED_operator_region_view3d_active; /* flags */ ot->flag= 0; @@ -2044,7 +2044,7 @@ void VIEW3D_OT_viewnumpad(wmOperatorType *ot) /* api callbacks */ ot->exec= viewnumpad_exec; - ot->poll= ED_operator_view3d_active; + ot->poll= ED_operator_region_view3d_active; /* flags */ ot->flag= 0; @@ -2162,7 +2162,7 @@ void VIEW3D_OT_view_pan(wmOperatorType *ot) /* api callbacks */ ot->exec= viewpan_exec; - ot->poll= ED_operator_view3d_active; + ot->poll= ED_operator_region_view3d_active; /* flags */ ot->flag= 0; @@ -2194,7 +2194,7 @@ void VIEW3D_OT_view_persportho(wmOperatorType *ot) /* api callbacks */ ot->exec= viewpersportho_exec; - ot->poll= ED_operator_view3d_active; + ot->poll= ED_operator_region_view3d_active; /* flags */ ot->flag= 0; @@ -2413,7 +2413,7 @@ void VIEW3D_OT_clip_border(wmOperatorType *ot) ot->exec= view3d_clipping_exec; ot->modal= WM_border_select_modal; - ot->poll= ED_operator_view3d_active; + ot->poll= ED_operator_region_view3d_active; /* flags */ ot->flag= 0; |