diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2015-11-22 07:25:32 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2015-11-23 00:49:03 +0300 |
| commit | 47ce2d7bef32a7f5de34ac3e0cfb8300a4e63cd9 (patch) | |
| tree | f6d6546747f58325d80ccca6f17766b298e8461a /source/blender/editors | |
| parent | e6c58df74e1fe8e7921048bc145b6318322541f2 (diff) | |
OpenNL: significantly simplify code using Eigen / STL.
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/armature/meshlaplacian.c | 6 | ||||
| -rw-r--r-- | source/blender/editors/armature/reeb.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/uvedit/uvedit_parametrizer.c | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/editors/armature/meshlaplacian.c b/source/blender/editors/armature/meshlaplacian.c index d2dd0e474c0..956cbe25c3b 100644 --- a/source/blender/editors/armature/meshlaplacian.c +++ b/source/blender/editors/armature/meshlaplacian.c @@ -64,7 +64,7 @@ static void error(const char *str) { printf("error: %s\n", str); } /************************** Laplacian System *****************************/ struct LaplacianSystem { - NLContext context; /* opennl context */ + NLContext *context; /* opennl context */ int totvert, totface; @@ -341,7 +341,7 @@ int laplacian_system_solve(LaplacianSystem *sys) //nlPrintMatrix(); - return nlSolveAdvanced(NULL, NL_TRUE); + return nlSolve(NL_TRUE); } float laplacian_system_get_solution(int v) @@ -1438,7 +1438,7 @@ static void meshdeform_matrix_solve(MeshDeformModifierData *mmd, MeshDeformBind nlEnd(NL_MATRIX); nlEnd(NL_SYSTEM); - if (nlSolveAdvanced(NULL, NL_TRUE)) { + if (nlSolve(NL_TRUE)) { for (z = 0; z < mdb->size; z++) for (y = 0; y < mdb->size; y++) for (x = 0; x < mdb->size; x++) diff --git a/source/blender/editors/armature/reeb.c b/source/blender/editors/armature/reeb.c index f29d15ff416..e10ae4bcf3f 100644 --- a/source/blender/editors/armature/reeb.c +++ b/source/blender/editors/armature/reeb.c @@ -2628,7 +2628,7 @@ int weightToHarmonic(EditMesh *em, EdgeIndex *indexed_edges) nlEnd(NL_SYSTEM); - success = nlSolveAdvanced(NULL, NL_TRUE); + success = nlSolve(NL_TRUE); if (success) { rval = 1; diff --git a/source/blender/editors/uvedit/uvedit_parametrizer.c b/source/blender/editors/uvedit/uvedit_parametrizer.c index 00615f9bef7..cb387b4af22 100644 --- a/source/blender/editors/uvedit/uvedit_parametrizer.c +++ b/source/blender/editors/uvedit/uvedit_parametrizer.c @@ -193,7 +193,7 @@ typedef struct PChart { union PChartUnion { struct PChartLscm { - NLContext context; + NLContext *context; float *abf_alpha; PVert *pin1, *pin2; } lscm; @@ -2613,7 +2613,7 @@ static PBool p_abf_matrix_invert(PAbfSystem *sys, PChart *chart) nlEnd(NL_SYSTEM); - success = nlSolve(); + success = nlSolve(NL_FALSE); if (success) { for (f = chart->faces; f; f = f->nextlink) { @@ -3223,7 +3223,7 @@ static PBool p_chart_lscm_solve(PHandle *handle, PChart *chart) nlEnd(NL_SYSTEM); - if (nlSolveAdvanced(NULL, NL_TRUE)) { + if (nlSolve(NL_TRUE)) { p_chart_lscm_load_solution(chart); return P_TRUE; } |