diff options
| author | Germano <germano.costa@ig.com.br> | 2017-11-10 18:02:49 +0300 |
|---|---|---|
| committer | Germano <germano.costa@ig.com.br> | 2017-11-10 18:02:49 +0300 |
| commit | 8f5e7c3fa9914144d5b1d24b8e336f2b2ee0344b (patch) | |
| tree | 15799534ffc72d1e59e5403a353196b730308a8e /source/blender/blenkernel/intern/mball_tessellate.c | |
| parent | 58a3057099fda337bb9b416d297b8cc3078238ec (diff) | |
| parent | d95eabf0a937e788e1ebd6f9297b3c80db7913e2 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/mball_tessellate.c')
| -rw-r--r-- | source/blender/blenkernel/intern/mball_tessellate.c | 45 |
1 files changed, 11 insertions, 34 deletions
diff --git a/source/blender/blenkernel/intern/mball_tessellate.c b/source/blender/blenkernel/intern/mball_tessellate.c index b4eff3f989f..5e63b5c1607 100644 --- a/source/blender/blenkernel/intern/mball_tessellate.c +++ b/source/blender/blenkernel/intern/mball_tessellate.c @@ -413,16 +413,10 @@ static void make_face(PROCESS *process, int i1, int i2, int i3, int i4) cur[0] = i1; cur[1] = i2; cur[2] = i3; - - if (i4 == 0) { - cur[3] = i3; - } - else { - cur[3] = i4; - } + cur[3] = i4; #ifdef USE_ACCUM_NORMAL - if (i4 == 0) { + if (i4 == i3) { normal_tri_v3(n, process->co[i1], process->co[i2], process->co[i3]); accumulate_vertex_normals_v3( process->no[i1], process->no[i2], process->no[i3], NULL, n, @@ -527,40 +521,23 @@ static void docube(PROCESS *process, CUBE *cube) if (count > 2) { switch (count) { case 3: - make_face(process, indexar[2], indexar[1], indexar[0], 0); + make_face(process, indexar[2], indexar[1], indexar[0], indexar[0]); /* triangle */ break; case 4: - if (indexar[0] == 0) make_face(process, indexar[0], indexar[3], indexar[2], indexar[1]); - else make_face(process, indexar[3], indexar[2], indexar[1], indexar[0]); + make_face(process, indexar[3], indexar[2], indexar[1], indexar[0]); break; case 5: - if (indexar[0] == 0) make_face(process, indexar[0], indexar[3], indexar[2], indexar[1]); - else make_face(process, indexar[3], indexar[2], indexar[1], indexar[0]); - - make_face(process, indexar[4], indexar[3], indexar[0], 0); + make_face(process, indexar[3], indexar[2], indexar[1], indexar[0]); + make_face(process, indexar[4], indexar[3], indexar[0], indexar[0]); /* triangle */ break; case 6: - if (indexar[0] == 0) { - make_face(process, indexar[0], indexar[3], indexar[2], indexar[1]); - make_face(process, indexar[0], indexar[5], indexar[4], indexar[3]); - } - else { - make_face(process, indexar[3], indexar[2], indexar[1], indexar[0]); - make_face(process, indexar[5], indexar[4], indexar[3], indexar[0]); - } + make_face(process, indexar[3], indexar[2], indexar[1], indexar[0]); + make_face(process, indexar[5], indexar[4], indexar[3], indexar[0]); break; case 7: - if (indexar[0] == 0) { - make_face(process, indexar[0], indexar[3], indexar[2], indexar[1]); - make_face(process, indexar[0], indexar[5], indexar[4], indexar[3]); - } - else { - make_face(process, indexar[3], indexar[2], indexar[1], indexar[0]); - make_face(process, indexar[5], indexar[4], indexar[3], indexar[0]); - } - - make_face(process, indexar[6], indexar[5], indexar[0], 0); - + make_face(process, indexar[3], indexar[2], indexar[1], indexar[0]); + make_face(process, indexar[5], indexar[4], indexar[3], indexar[0]); + make_face(process, indexar[6], indexar[5], indexar[0], indexar[0]); /* triangle */ break; } } |