diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-04-07 20:12:19 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-04-07 20:12:19 -0300 |
| commit | 49ca7b5f1238fe8384895550f35328accedae94c (patch) | |
| tree | e6b822c41b5777488688f30561c001180ef171ee | |
| parent | 79782457847af00907ea3c881cd30b8999ddcd1f (diff) | |
| parent | 68c2a959dd8516823f9f501bed1ac23197e892d2 (diff) | |
Merge pull request #1609 from TheoXD/_fix_crash_in_viewport_picking
Fixed crash in viewport object picking.
| -rw-r--r-- | scene/main/viewport.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp index ee400ae6d5..f0c71da153 100644 --- a/scene/main/viewport.cpp +++ b/scene/main/viewport.cpp @@ -406,7 +406,7 @@ void Viewport::_notification(int p_what) { int rc = ss2d->intersect_point(point,res,64,Set<RID>(),0xFFFFFFFF,0xFFFFFFFF); for(int i=0;i<rc;i++) { - if (res[i].collider) { + if (res[i].collider_id && res[i].collider) { CollisionObject2D *co=res[i].collider->cast_to<CollisionObject2D>(); if (co) { |