Skip to content

Commit

Permalink
Merge 6bfa1d3 into aad3d24
Browse files Browse the repository at this point in the history
  • Loading branch information
alan-wu committed Aug 12, 2020
2 parents aad3d24 + 6bfa1d3 commit 64ae0ab
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "physiomeportal",
"version": "0.4.20",
"version": "0.4.21",
"description": "Physiome Portal",
"main": "build/physiomeportal.js",
"files": [
Expand Down
6 changes: 4 additions & 2 deletions src/modules/RendererModule.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,11 @@ RendererModule.prototype.getIntersectedObject = function(intersects) {
if (intersects[i] !== undefined) {
if (intersects[i].object &&
intersects[i].object.userData &&
intersects[i].object.userData.isZincObject) {
intersects[i].object.userData.isZincObject &&
(intersects[i].object.name ||
intersects[i].object.userData.isGlyph ||
intersects[i].object.userData.isMarker))
return intersects[i];
}
}
}
}
Expand Down

0 comments on commit 64ae0ab

Please sign in to comment.