Fix out of bounds Memory read in Material.Maps by using the MATERIAL_MAP_SPECULAR define instead of the SHADER_LOG_SPECULAR enum
This commit is contained in:
parent
3881d2aac2
commit
a6ade0dcc6
|
|
@ -1719,10 +1719,10 @@ void DrawMeshInstanced(Mesh mesh, Material material, const Matrix *transforms, i
|
||||||
if (material.shader.locs[SHADER_LOC_COLOR_SPECULAR] != -1)
|
if (material.shader.locs[SHADER_LOC_COLOR_SPECULAR] != -1)
|
||||||
{
|
{
|
||||||
float values[4] = {
|
float values[4] = {
|
||||||
(float)material.maps[SHADER_LOC_COLOR_SPECULAR].color.r/255.0f,
|
(float)material.maps[MATERIAL_MAP_SPECULAR].color.r/255.0f,
|
||||||
(float)material.maps[SHADER_LOC_COLOR_SPECULAR].color.g/255.0f,
|
(float)material.maps[MATERIAL_MAP_SPECULAR].color.g/255.0f,
|
||||||
(float)material.maps[SHADER_LOC_COLOR_SPECULAR].color.b/255.0f,
|
(float)material.maps[MATERIAL_MAP_SPECULAR].color.b/255.0f,
|
||||||
(float)material.maps[SHADER_LOC_COLOR_SPECULAR].color.a/255.0f
|
(float)material.maps[MATERIAL_MAP_SPECULAR].color.a/255.0f
|
||||||
};
|
};
|
||||||
|
|
||||||
rlSetUniform(material.shader.locs[SHADER_LOC_COLOR_SPECULAR], values, SHADER_UNIFORM_VEC4, 1);
|
rlSetUniform(material.shader.locs[SHADER_LOC_COLOR_SPECULAR], values, SHADER_UNIFORM_VEC4, 1);
|
||||||
|
|
@ -7126,4 +7126,4 @@ static ModelAnimation *LoadModelAnimationsM3D(const char *fileName, int *animCou
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif // SUPPORT_MODULE_RMODELS
|
#endif // SUPPORT_MODULE_RMODELS
|
||||||
Loading…
Reference in New Issue
Block a user