diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2011-07-27 11:42:53 +0400 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2011-07-27 11:42:53 +0400 |
| commit | 73a9ce7ec04bd1170b292c8f2c83a8c5c10a95ad (patch) | |
| tree | cfc0637d68339e9b4cd45de49aa30d585748717b /source/blender/editors/space_view3d/view3d_edit.c | |
| parent | f54068719f8f1965ffd3584f9f8ad53b3c7f9602 (diff) | |
svn merge -r38558:38752 https://svn.blender.org/svnroot/bf-blender/trunk/blender .
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_edit.c')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_edit.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index b343718d39b..94224698063 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -129,7 +129,6 @@ void ED_view3d_camera_lock_sync(View3D *v3d, RegionView3D *rv3d) } else { ED_view3d_to_object(v3d->camera, rv3d->ofs, rv3d->viewquat, rv3d->dist); - root_parent= v3d->camera; DAG_id_tag_update(&v3d->camera->id, OB_RECALC_OB); WM_main_add_notifier(NC_OBJECT|ND_TRANSFORM, v3d->camera); } |