Merge pull request #5791 from jherico/homer

Fix procedural vec3 uniforms
This commit is contained in:
Seth Alves 2015-09-12 13:40:07 -07:00
commit 4d6d882f52

View file

@ -203,8 +203,8 @@ void Procedural::prepare(gpu::Batch& batch, const glm::vec3& size) {
case 3:
batch._glUniform3f(slot,
valueArray[0].toDouble(),
valueArray[0].toDouble(),
valueArray[1].toDouble());
valueArray[1].toDouble(),
valueArray[2].toDouble());
break;
case 4:
default:
@ -234,4 +234,4 @@ glm::vec4 Procedural::getColor(const glm::vec4& entityColor) {
return glm::vec4(1);
}
return entityColor;
}
}