diff options
| author | Diego Borghetti <bdiego@gmail.com> | 2010-06-09 19:35:10 +0400 |
|---|---|---|
| committer | Diego Borghetti <bdiego@gmail.com> | 2010-06-09 19:35:10 +0400 |
| commit | e2bc4ca9cee0c66c10efb9cf552c1135f30e7a4b (patch) | |
| tree | 34c0e88f6e5b8134bee1528b7eae1aeb443b63b6 /source/blender/editors/object/object_add.c | |
| parent | 1a3686701736cd60defc2e034f5e3806845291bf (diff) | |
Fix #22317 View reamins in camera's view after camera is deleted (again)
The problem was not in the editors, the code in blenkernel have a XXX
in the perspective value. Now unlink_object also update the ARegion.
Diffstat (limited to 'source/blender/editors/object/object_add.c')
| -rw-r--r-- | source/blender/editors/object/object_add.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index e0e0bb06652..77c373c93e2 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -826,8 +826,6 @@ void ED_base_object_free_and_unlink(Scene *scene, Base *base) static int object_delete_exec(bContext *C, wmOperator *op) { Scene *scene= CTX_data_scene(C); - View3D *v3d = CTX_wm_view3d(C); - RegionView3D *rv3d= CTX_wm_region_view3d(C); int islamp= 0; if(CTX_data_edit_object(C)) @@ -836,17 +834,6 @@ static int object_delete_exec(bContext *C, wmOperator *op) CTX_DATA_BEGIN(C, Base*, base, selected_bases) { if(base->object->type==OB_LAMP) islamp= 1; - else if (base->object->type == OB_CAMERA) { - /* If we don't reset this, Blender crash - * in fly mode because still have the - * old object here!. - * See Bug #22317 - */ - if (v3d && rv3d && rv3d->persp == RV3D_CAMOB && base->object == v3d->camera) { - rv3d->persp= RV3D_PERSP; - v3d->camera= NULL; - } - } /* remove from current scene only */ ED_base_object_free_and_unlink(scene, base); } |