From ac441cecd03b60c8e4b9d2b41b2f2096df1f2be1 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 10 Oct 2009 23:50:15 +0000 Subject: [PATCH] bugfix - [#19563] Select camera+ctrl alt 0 crash --- source/blender/editors/space_view3d/view3d_view.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c index d26141e3b54..fd850e90ff5 100644 --- a/source/blender/editors/space_view3d/view3d_view.c +++ b/source/blender/editors/space_view3d/view3d_view.c @@ -411,6 +411,7 @@ static int view3d_setcameratoview_exec(bContext *C, wmOperator *op) RegionView3D *rv3d= CTX_wm_region_view3d(C); setcameratoview3d(v3d, rv3d, v3d->camera); + rv3d->persp = V3D_CAMOB; WM_event_add_notifier(C, NC_OBJECT|ND_TRANSFORM, CTX_data_scene(C)); @@ -418,6 +419,16 @@ static int view3d_setcameratoview_exec(bContext *C, wmOperator *op) } +int view3d_setcameratoview_poll(bContext *C) +{ + View3D *v3d = CTX_wm_view3d(C); + RegionView3D *rv3d= CTX_wm_region_view3d(C); + + if (v3d==NULL || v3d->camera==NULL) return 0; + if (rv3d && rv3d->viewlock != 0) return 0; + return 1; +} + void VIEW3D_OT_setcameratoview(wmOperatorType *ot) { @@ -428,7 +439,7 @@ void VIEW3D_OT_setcameratoview(wmOperatorType *ot) /* api callbacks */ ot->exec= view3d_setcameratoview_exec; - ot->poll= ED_operator_view3d_active; + ot->poll= view3d_setcameratoview_poll; /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;