diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-07-31 04:42:10 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-07-31 04:42:10 +0400 |
| commit | c371f49d9aaf2c9eca90329954fe217efb5cf3f6 (patch) | |
| tree | 142b9cb20d8b963f0cfd8a8fd4ee6437a47dafc4 /source/blender/blenkernel/BKE_cloth.h | |
| parent | b55e996874c8b9a12b4a2a50f9d1993b5f921c57 (diff) | |
| parent | 7301f33b26ccae263d0bfdde5f82d98a70790fd5 (diff) | |
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r21908:22075
Diffstat (limited to 'source/blender/blenkernel/BKE_cloth.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_cloth.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/blenkernel/BKE_cloth.h b/source/blender/blenkernel/BKE_cloth.h index 4270c677338..f3165c959bf 100644 --- a/source/blender/blenkernel/BKE_cloth.h +++ b/source/blender/blenkernel/BKE_cloth.h @@ -65,8 +65,7 @@ struct CollisionTree; #elif defined (__sun) || defined (__sun__) # define DO_INLINE #else -# define DO_INLINE inline -# define LINUX +# define DO_INLINE static inline #endif #define CLOTH_MAX_THREAD 2 |