summaryrefslogtreecommitdiffhomepage
path: root/src/rmodels.c
diff options
context:
space:
mode:
authorRoy Qu <[email protected]>2022-01-21 19:52:07 +0800
committerGitHub <[email protected]>2022-01-21 12:52:07 +0100
commit45ef46c5e809e4dbfb2dfe2530350f05db7641b8 (patch)
tree690129450357729c35655bb82119774ea1e777d0 /src/rmodels.c
parentdfac74ffa7f2f24516ec18a3fa6345a2d238f247 (diff)
downloadraylib-45ef46c5e809e4dbfb2dfe2530350f05db7641b8.tar.gz
raylib-45ef46c5e809e4dbfb2dfe2530350f05db7641b8.zip
fix: material color won't be loaded if there's no texture for that material (#2298)
Diffstat (limited to 'src/rmodels.c')
-rw-r--r--src/rmodels.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/rmodels.c b/src/rmodels.c
index 22559e34..601ce234 100644
--- a/src/rmodels.c
+++ b/src/rmodels.c
@@ -4692,13 +4692,12 @@ static Model LoadGLTF(const char *fileName)
model.materials[j].maps[MATERIAL_MAP_ALBEDO].texture = LoadTextureFromImage(imAlbedo);
UnloadImage(imAlbedo);
}
-
- // Load base color factor (tint)
- model.materials[j].maps[MATERIAL_MAP_ALBEDO].color.r = (unsigned char)(data->materials[i].pbr_metallic_roughness.base_color_factor[0]*255);
- model.materials[j].maps[MATERIAL_MAP_ALBEDO].color.g = (unsigned char)(data->materials[i].pbr_metallic_roughness.base_color_factor[1]*255);
- model.materials[j].maps[MATERIAL_MAP_ALBEDO].color.b = (unsigned char)(data->materials[i].pbr_metallic_roughness.base_color_factor[2]*255);
- model.materials[j].maps[MATERIAL_MAP_ALBEDO].color.a = (unsigned char)(data->materials[i].pbr_metallic_roughness.base_color_factor[3]*255);
}
+ // Load base color factor (tint)
+ model.materials[j].maps[MATERIAL_MAP_ALBEDO].color.r = (unsigned char)(data->materials[i].pbr_metallic_roughness.base_color_factor[0]*255);
+ model.materials[j].maps[MATERIAL_MAP_ALBEDO].color.g = (unsigned char)(data->materials[i].pbr_metallic_roughness.base_color_factor[1]*255);
+ model.materials[j].maps[MATERIAL_MAP_ALBEDO].color.b = (unsigned char)(data->materials[i].pbr_metallic_roughness.base_color_factor[2]*255);
+ model.materials[j].maps[MATERIAL_MAP_ALBEDO].color.a = (unsigned char)(data->materials[i].pbr_metallic_roughness.base_color_factor[3]*255);
// Load metallic/roughness texture
if (data->materials[i].pbr_metallic_roughness.metallic_roughness_texture.texture)