archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

bugfix - [#19563] Select camera+ctrl alt 0 crash

Browse Source
This commit is contained in:
Campbell Barton
2009-10-10 23:50:15 +00:00
parent fc44a97b73
commit ac441cecd0
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/editors/space_view3d/view3d_view.c
View File

@@ -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;