Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 13:18:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

guard against NULL _models

Browse source
This commit is contained in:
Atlante45 2014-12-09 11:52:20 -08:00
parent ba81030aa1
commit a6f7a1ce15
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
interface/src/entities/RenderableModelEntityItem.cpp
View file

@ -268,7 +268,10 @@ EntityItemProperties RenderableModelEntityItem::getProperties() const {
bool RenderableModelEntityItem::findDetailedRayIntersection(const glm::vec3& origin, const glm::vec3& direction, bool RenderableModelEntityItem::findDetailedRayIntersection(const glm::vec3& origin, const glm::vec3& direction,
bool& keepSearching, OctreeElement*& element, float& distance, BoxFace& face, bool& keepSearching, OctreeElement*& element, float& distance, BoxFace& face,
void** intersectedObject, bool precisionPicking) const { void** intersectedObject, bool precisionPicking) const {
if (!_model) {
return true;
}
glm::vec3 originInMeters = origin * (float)TREE_SCALE; glm::vec3 originInMeters = origin * (float)TREE_SCALE;
QString extraInfo; QString extraInfo;
float localDistance; float localDistance;