OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge remote-tracking branch 'remotes/origin/master' into asmjit

Browse source
This commit is contained in:
Christoph Oelckers 2018-11-30 18:49:28 +01:00
commit 8e46cb3a21
30 changed files with 320 additions and 351 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/r_data/models/models_obj.cpp
View file

@ -236,7 +236,7 @@ bool FOBJModel::Load(const char* fn, int lumpnum, const char* buffer, int length
*/
template<typename T, size_t L> void FOBJModel::ParseVector(TArray<T> &array)
{
float *coord = new float[L];
float coord[L];
for (size_t axis = 0; axis < L; axis++)
{
sc.MustGetFloat();
@ -244,7 +244,6 @@ template<typename T, size_t L> void FOBJModel::ParseVector(TArray<T> &array)
}
T vec(coord);
array.Push(vec);
delete[] coord;
}
/**