diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-09-20 21:06:17 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-09-20 21:06:17 +0400 |
| commit | 9d1b4b63b33b77505f4399a4db4f462f5b1fd1eb (patch) | |
| tree | 31d83fbd17c4790211707a3ce13c78b664647c23 /source/blender/modifiers | |
| parent | 0169079bd1c3ce69690153321fb09c3647b9d930 (diff) | |
Fix for recent commit:
- Some declarations after statement left.
- Do not use static inline functions in MOD_navmesh. It produces errors
with msvc and not sure it's actually helps -- optimizer should
make it inlined itself.
Diffstat (limited to 'source/blender/modifiers')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_navmesh.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/modifiers/intern/MOD_navmesh.c b/source/blender/modifiers/intern/MOD_navmesh.c index e05f91058f3..5a8c79ba4dd 100644 --- a/source/blender/modifiers/intern/MOD_navmesh.c +++ b/source/blender/modifiers/intern/MOD_navmesh.c @@ -48,12 +48,12 @@ #include "BKE_customdata.h" #include "MEM_guardedalloc.h" -static inline int bit(int a, int b) +static int bit(int a, int b) { return (a & (1 << b)) >> b; } -static inline void intToCol(int i, float* col) +static void intToCol(int i, float* col) { int r = bit(i, 0) + bit(i, 3) * 2 + 1; int g = bit(i, 1) + bit(i, 4) * 2 + 1; |