v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix merge issue

iamAdrianIusca-master
Kim Kulling 2020-07-27 11:18:46 +02:00 committed by GitHub
parent 08f945b7ec
commit 1607c8e6e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
code/Common/StandardShapes.cpp
View File

@ -467,7 +467,6 @@ void StandardShapes::MakeCircle(ai_real radius, unsigned int tess,
ai_real s = 1.0; // std::cos(angle == 0); ai_real s = 1.0; // std::cos(angle == 0);
ai_real t = 0.0; // std::sin(angle == 0); ai_real t = 0.0; // std::sin(angle == 0);
<<<<<<< HEAD
for (ai_real angle = 0.0; angle < angle_max;) { for (ai_real angle = 0.0; angle < angle_max;) {
positions.emplace_back(aiVector3D(s * radius, 0.0, t * radius)); positions.emplace_back(aiVector3D(s * radius, 0.0, t * radius));
angle += angle_delta; angle += angle_delta;