viewer#1553 Local PBR materials are not applied to the terrain
parent
04c4d18f70
commit
db627bc354
|
|
@ -49,6 +49,10 @@ LLGLTexture::LLGLTexture(const LLImageRaw* raw, bool usemipmaps)
|
|||
mUseMipMaps = usemipmaps ;
|
||||
// Create an empty image of the specified size and width
|
||||
mGLTexturep = new LLImageGL(raw, usemipmaps) ;
|
||||
mFullWidth = mGLTexturep->getWidth();
|
||||
mFullHeight = mGLTexturep->getHeight();
|
||||
mComponents = mGLTexturep->getComponents();
|
||||
setTexelsPerImage();
|
||||
}
|
||||
|
||||
LLGLTexture::~LLGLTexture()
|
||||
|
|
|
|||
|
|
@ -177,6 +177,8 @@ bool LLLocalGLTFMaterial::updateSelf()
|
|||
}
|
||||
}
|
||||
|
||||
materialBegin();
|
||||
materialComplete(true);
|
||||
updated = true;
|
||||
}
|
||||
|
||||
|
|
@ -201,6 +203,8 @@ bool LLLocalGLTFMaterial::updateSelf()
|
|||
LLNotificationsUtil::add("LocalBitmapsUpdateFailedFinal", notif_args);
|
||||
|
||||
mLinkStatus = LS_BROKEN;
|
||||
materialBegin();
|
||||
materialComplete(false);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -218,6 +222,8 @@ bool LLLocalGLTFMaterial::updateSelf()
|
|||
LLNotificationsUtil::add("LocalBitmapsUpdateFileNotFound", notif_args);
|
||||
|
||||
mLinkStatus = LS_BROKEN;
|
||||
materialBegin();
|
||||
materialComplete(false);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue