diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-01-04 16:57:15 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-01-04 16:57:15 +0400 |
| commit | e2e5cb881c3a687ece844684be9c2bc5b253e57c (patch) | |
| tree | 55ff688081e4b82df092eb3b80889fa570af6c00 /source/blender/editors/space_view3d/view3d_snap.c | |
| parent | d0cdefd9fa37bf6788dad27b87d8d569c58ad94a (diff) | |
| parent | 49cf3c76a93c8e41ddbece82f629e90c21651d19 (diff) | |
svn merge ^/trunk/blender -r43117:43124
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_snap.c')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_snap.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/editors/space_view3d/view3d_snap.c b/source/blender/editors/space_view3d/view3d_snap.c index 85ddc41039c..1ee0c03d5e5 100644 --- a/source/blender/editors/space_view3d/view3d_snap.c +++ b/source/blender/editors/space_view3d/view3d_snap.c @@ -827,8 +827,7 @@ static void bundle_midpoint(Scene *scene, Object *ob, float vec[3]) tracking= &clip->tracking; - if(scene->camera) - copy_m4_m4(cammat, scene->camera->obmat); + copy_m4_m4(cammat, ob->obmat); BKE_get_tracking_mat(scene, ob, mat); |