Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-02-03 06:01:45 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-02-03 06:59:11 +0300
commit744f6339865fa8ed00b2e98aa5812b94d67a8604 (patch)
treeac31a849b46a8214baf16b87e104841a5fa85b11 /intern/dualcon
parent141c6073ca39f0d59c67ebef89b094395b903a4a (diff)
Cleanup: trailing commas
Needed for clan-format not to wrap onto one line.
Diffstat (limited to 'intern/dualcon')
-rw-r--r--intern/dualcon/intern/Projections.cpp14
-rw-r--r--intern/dualcon/intern/octree.cpp14
2 files changed, 14 insertions, 14 deletions
diff --git a/intern/dualcon/intern/Projections.cpp b/intern/dualcon/intern/Projections.cpp
index e7c72a5671c..9fc9f5beb14 100644
--- a/intern/dualcon/intern/Projections.cpp
+++ b/intern/dualcon/intern/Projections.cpp
@@ -29,7 +29,7 @@ const int vertmap[8][3] = {
{1, 0, 0},
{1, 0, 1},
{1, 1, 0},
- {1, 1, 1}
+ {1, 1, 1},
};
const int centmap[3][3][3][2] = {
@@ -58,7 +58,7 @@ const int edgemap[12][2] = {
{0, 1},
{2, 3},
{4, 5},
- {6, 7}
+ {6, 7},
};
const int facemap[6][4] = {
@@ -67,7 +67,7 @@ const int facemap[6][4] = {
{0, 1, 4, 5},
{2, 3, 6, 7},
{0, 2, 4, 6},
- {1, 3, 5, 7}
+ {1, 3, 5, 7},
};
/**
@@ -108,9 +108,9 @@ static void normalize(double a[3])
/* Create projection axes for cube+triangle intersection testing.
* 0, 1, 2: cube face normals
- *
+ *
* 3: triangle normal
- *
+ *
* 4, 5, 6,
* 7, 8, 9,
* 10, 11, 12: cross of each triangle edge vector with each cube
@@ -221,7 +221,7 @@ CubeTriangleIsect::CubeTriangleIsect(int64_t cube[2][3], int64_t tri[3][3], int6
for (i = 1; i < 3; i++) {
if (vts[i] < inherit->tri_proj[axis][0])
inherit->tri_proj[axis][0] = vts[i];
-
+
if (vts[i] > inherit->tri_proj[axis][1])
inherit->tri_proj[axis][1] = vts[i];
}
@@ -243,7 +243,7 @@ CubeTriangleIsect::CubeTriangleIsect(CubeTriangleIsect *parent)
for (int j = 0; j < 3; j++)
cubeProj[i].edges[j] = parent->cubeProj[i].edges[j] >> 1;
-
+
cubeProj[i].min = parent->cubeProj[i].min >> 1;
cubeProj[i].max = parent->cubeProj[i].max >> 1;
}
diff --git a/intern/dualcon/intern/octree.cpp b/intern/dualcon/intern/octree.cpp
index 8c3aa7818bc..878cd2971de 100644
--- a/intern/dualcon/intern/octree.cpp
+++ b/intern/dualcon/intern/octree.cpp
@@ -366,7 +366,7 @@ InternalNode *Octree::addTriangle(InternalNode *node, CubeTriangleIsect *p, int
{0, 0, 1}};
unsigned char boxmask = p->getBoxMask();
CubeTriangleIsect *subp = new CubeTriangleIsect(p);
-
+
int count = 0;
int tempdiff[3] = {0, 0, 0};
@@ -2224,7 +2224,7 @@ void Octree::computeMinimizer(const LeafNode *leaf, int st[3], int len,
default: {
// Sharp features */
-
+
// construct QEF and minimizer
float mp[3] = {0, 0, 0};
minimize(rvalue, mp, pts, norms, parity);
@@ -2753,7 +2753,7 @@ const int faceMap[6][4] = {
{0, 8, 1, 10},
{2, 9, 3, 11},
{0, 4, 2, 6},
- {1, 5, 3, 7}
+ {1, 5, 3, 7},
};
const int cellProcFaceMask[12][3] = {
@@ -2768,7 +2768,7 @@ const int cellProcFaceMask[12][3] = {
{0, 1, 2},
{2, 3, 2},
{4, 5, 2},
- {6, 7, 2}
+ {6, 7, 2},
};
const int cellProcEdgeMask[6][5] = {
@@ -2777,7 +2777,7 @@ const int cellProcEdgeMask[6][5] = {
{0, 4, 1, 5, 1},
{2, 6, 3, 7, 1},
{0, 2, 4, 6, 2},
- {1, 3, 5, 7, 2}
+ {1, 3, 5, 7, 2},
};
const int faceProcFaceMask[3][4][3] = {
@@ -2822,7 +2822,7 @@ const int edgeProcEdgeMask[3][2][5] = {
const int processEdgeMask[3][4] = {
{3, 2, 1, 0},
{7, 5, 6, 4},
- {11, 10, 9, 8}
+ {11, 10, 9, 8},
};
const int dirCell[3][4][3] = {
@@ -2843,7 +2843,7 @@ const int dirCell[3][4][3] = {
const int dirEdge[3][4] = {
{3, 2, 1, 0},
{7, 6, 5, 4},
- {11, 10, 9, 8}
+ {11, 10, 9, 8},
};
int InternalNode::numChildrenTable[256];