diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-01-08 15:57:53 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-01-08 15:57:53 +0400 |
| commit | 76a211d80947a453f594e4cf0a1e0acc6786eddf (patch) | |
| tree | 59d806409fe72f733bce9c43eb6823b59642c6fd /source/blender/editors/space_view3d | |
| parent | f88501a44d1f519539d056a7d1f240d126a5071a (diff) | |
| parent | 3dead22c7322cf72ee63a003ba50940abc12e7c9 (diff) | |
Merged changes in the trunk up to revision 43219.
Conflicts resolved:
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/render/intern/source/pipeline.c
Diffstat (limited to 'source/blender/editors/space_view3d')
| -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 ad2a0da4510..6bc1b3acce6 100644 --- a/source/blender/editors/space_view3d/view3d_snap.c +++ b/source/blender/editors/space_view3d/view3d_snap.c @@ -768,8 +768,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); |