diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-11-25 08:33:41 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-11-25 08:36:19 +0400 |
| commit | 2b4c68b902b261127f7deabf922048c41be6fb55 (patch) | |
| tree | 1c40311a6c8e13ea4754fc692283b11cafdb8bea /source/blender/modifiers/intern/MOD_laplaciandeform.c | |
| parent | 295116ea6b3a81a6c7b84d8a9d21288108c5f19e (diff) | |
CMake Build: option to compile without opennl/superlu.
Diffstat (limited to 'source/blender/modifiers/intern/MOD_laplaciandeform.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_laplaciandeform.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/source/blender/modifiers/intern/MOD_laplaciandeform.c b/source/blender/modifiers/intern/MOD_laplaciandeform.c index 3b909a4b209..a8a6f1a1cb9 100644 --- a/source/blender/modifiers/intern/MOD_laplaciandeform.c +++ b/source/blender/modifiers/intern/MOD_laplaciandeform.c @@ -41,7 +41,6 @@ #include "MOD_util.h" -#include "ONL_opennl.h" enum { LAPDEFORM_SYSTEM_NOT_CHANGE = 0, @@ -54,6 +53,10 @@ enum { LAPDEFORM_SYSTEM_CHANGE_NOT_VALID_GROUP, }; +#ifdef WITH_OPENNL + +#include "ONL_opennl.h" + typedef struct LaplacianSystem { bool is_matrix_computed; bool has_solution; @@ -766,6 +769,14 @@ static void LaplacianDeformModifier_do( } } +#else /* WITH_OPENNL */ +static void LaplacianDeformModifier_do( + LaplacianDeformModifierData *lmd, Object *ob, DerivedMesh *dm, + float (*vertexCos)[3], int numVerts) +{ + (void)lmd, (void)ob, (void)dm, (void)vertexCos, (void)numVerts; +} +#endif /* WITH_OPENNL */ static void initData(ModifierData *md) { @@ -831,11 +842,12 @@ static void deformVertsEM( static void freeData(ModifierData *md) { LaplacianDeformModifierData *lmd = (LaplacianDeformModifierData *)md; +#ifdef WITH_OPENNL LaplacianSystem *sys = (LaplacianSystem *)lmd->cache_system; - if (sys) { deleteLaplacianSystem(sys); } +#endif MEM_SAFE_FREE(lmd->vertexco); lmd->total_verts = 0; } |