diff options
author | Jeroen Bakker <jbakker> | 2019-12-30 11:21:29 +0300 |
---|---|---|
committer | Jeroen Bakker <j.bakker@atmind.nl> | 2019-12-30 11:22:04 +0300 |
commit | 79476a9c0ab9e3f29d32a87aa8f9d859f2961cb9 (patch) | |
tree | e551537f7f2db51d85088b371a3ddea369eadeff /source/blender/editors/space_view3d/view3d_select.c | |
parent | c2a37867f21be164a059552678ff3339bac39a7c (diff) |
Tracking: Selection Crash
Blender crashes when selecting a marker in the 3d viewport that is from the non active scene camera. This patch will solve this crash, but introduced a new scenario that isn't thought out. In the new scenario it is still hard to select a marker via the 3d viewport.
I would expect that when selecting a marker in this case would select the camera where the marker belongs to and select the marker that is under the mouse button.
Reviewed By: Sergey Sharybin
Differential Revision: https://developer.blender.org/D6360
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_select.c')
-rw-r--r-- | source/blender/editors/space_view3d/view3d_select.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c index 092142a83cd..85e9a2d7680 100644 --- a/source/blender/editors/space_view3d/view3d_select.c +++ b/source/blender/editors/space_view3d/view3d_select.c @@ -2077,7 +2077,8 @@ static bool ed_object_select_pick(bContext *C, if (has_bones && basact) { if (basact->object->type == OB_CAMERA) { - if (oldbasact == basact) { + MovieClip *clip = BKE_object_movieclip_get(scene, basact->object, false); + if (clip != NULL && oldbasact == basact) { int i, hitresult; bool changed = false; @@ -2094,7 +2095,6 @@ static bool ed_object_select_pick(bContext *C, * in height word, this buffer value belongs to camera. not to bundle */ if (buffer[4 * i + 3] & 0xFFFF0000) { - MovieClip *clip = BKE_object_movieclip_get(scene, basact->object, false); MovieTracking *tracking = &clip->tracking; ListBase *tracksbase; MovieTrackingTrack *track; |