#4334 Crash at getIsDynamic
parent
f1701d3373
commit
dd4100181d
|
|
@ -177,7 +177,7 @@ void LLReflectionMap::autoAdjustOrigin()
|
|||
mPriority = 1;
|
||||
mOrigin.load3(mViewerObject->getPositionAgent().mV);
|
||||
|
||||
if (mViewerObject->getVolume() && ((LLVOVolume*)mViewerObject)->getReflectionProbeIsBox())
|
||||
if (mViewerObject->getVolume() && ((LLVOVolume*)mViewerObject.get())->getReflectionProbeIsBox())
|
||||
{
|
||||
LLVector3 s = mViewerObject->getScale().scaledVec(LLVector3(0.5f, 0.5f, 0.5f));
|
||||
mRadius = s.magVec();
|
||||
|
|
|
|||
|
|
@ -124,7 +124,7 @@ public:
|
|||
LLSpatialGroup* mGroup = nullptr;
|
||||
|
||||
// viewer object this probe is tracking (if any)
|
||||
LLViewerObject* mViewerObject = nullptr;
|
||||
LLPointer<LLViewerObject> mViewerObject = nullptr;
|
||||
|
||||
// what priority should this probe have (higher is higher priority)
|
||||
// currently only 0 or 1
|
||||
|
|
|
|||
|
|
@ -1146,7 +1146,7 @@ void LLReflectionMapManager::updateUniforms()
|
|||
{
|
||||
if (refmap->mViewerObject && refmap->mViewerObject->getVolume())
|
||||
{ // have active manual probes live-track the object they're associated with
|
||||
LLVOVolume* vobj = (LLVOVolume*)refmap->mViewerObject;
|
||||
LLVOVolume* vobj = (LLVOVolume*)refmap->mViewerObject.get();
|
||||
|
||||
refmap->mOrigin.load3(vobj->getPositionAgent().mV);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue