blender
/
blender
132
398
Fork 577
Code Issues 6.2k Pull Requests 746 Projects 19 Wiki Activity

Merge branch 'master' into blender2.8

This commit is contained in:
Germano Cavalcante 2017-11-10 13:02:49 -02:00
parent 58a3057099 d95eabf0a9
commit 8f5e7c3fa9
1 changed files with 11 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
source/blender/blenkernel/intern/mball_tessellate.c
View File

@ -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;
}
}