Merge branch 'master' into hl1-mdl-remove-texture-256-clamping-2
This commit is contained in:
@@ -345,11 +345,11 @@ void HL1MDLLoader::read_texture(const Texture_HL1 *ptexture,
|
||||
uint8_t *data, uint8_t *pal, aiTexture *pResult,
|
||||
aiColor3D &last_palette_color) {
|
||||
pResult->mFilename = ptexture->name;
|
||||
pResult->mWidth = static_cast<unsigned int>(ptexture->width);
|
||||
pResult->mHeight = static_cast<unsigned int>(ptexture->height);
|
||||
pResult->achFormatHint[0] = 'b';
|
||||
pResult->mWidth = outwidth;
|
||||
pResult->mHeight = outheight;
|
||||
pResult->achFormatHint[0] = 'r';
|
||||
pResult->achFormatHint[1] = 'g';
|
||||
pResult->achFormatHint[2] = 'r';
|
||||
pResult->achFormatHint[2] = 'b';
|
||||
pResult->achFormatHint[3] = 'a';
|
||||
pResult->achFormatHint[4] = '8';
|
||||
pResult->achFormatHint[5] = '8';
|
||||
|
||||
Reference in New Issue
Block a user