diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2014-11-09 15:11:05 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2015-01-20 11:30:07 +0300 |
| commit | 046510fcf931eae9fd65c546b235b45f084a9118 (patch) | |
| tree | f6806e49f903d6f8240ff09bbb39980c6f9befd8 /source/blender/physics/intern/implicit_blender.c | |
| parent | be24adc9ef6a73aa9e0f06da6014911e6a8a80d2 (diff) | |
Merge branch 'hair_immediate_fixes' into gooseberry
Conflicts:
source/blender/physics/intern/BPH_mass_spring.cpp
Diffstat (limited to 'source/blender/physics/intern/implicit_blender.c')
| -rw-r--r-- | source/blender/physics/intern/implicit_blender.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/physics/intern/implicit_blender.c b/source/blender/physics/intern/implicit_blender.c index 865f100e7e6..cb115a2c10a 100644 --- a/source/blender/physics/intern/implicit_blender.c +++ b/source/blender/physics/intern/implicit_blender.c @@ -324,6 +324,7 @@ static void print_sparse_matrix(fmatrix3x3 *m) } } } +#endif static void print_lvector(lfVector *v, int numverts) { @@ -380,7 +381,6 @@ static void print_bfmatrix(fmatrix3x3 *m) MEM_freeN(t); } -#endif /* copy 3x3 matrix */ DO_INLINE void cp_fmatrix(float to[3][3], float from[3][3]) |