Merge last two commits into renderergl2

This commit is contained in:
Zack Middleton committed 2013-10-29 23:22:02 -05:00
1 parent 611d913443
commit 0f30dad10a
2 files changed
+4 -2

No files matched your search

+1 -1
View File
@@ -1104,7 +1104,7 @@ typedef struct {
// depending upon the exporter, blend indices and weights might be int/float
// as opposed to the recommended byte/byte, for example Noesis exports
// int/float whereas the official IQM tool exports byte/byte
byte blendWeightsType; // IQM_BYTE or IQM_FLOAT
byte blendWeightsType; // IQM_UBYTE or IQM_FLOAT
int *jointParents;
float *jointMats;