diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-10-24 08:18:28 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-10-24 08:18:28 +0400 |
| commit | 0503a4f7a6fa2aba573ff4f8d4c6d7f387894952 (patch) | |
| tree | 26fa3836cd19536e6445ef4aad8fcecece1614f3 /source/blender/blenkernel/intern/particle_system.c | |
| parent | 618d4d1a6e4a3df8399549fa80846cdeacb7299c (diff) | |
| parent | 2bd9519e39f7c383005fd531f4c7dd92cce246ad (diff) | |
svn merge ^/trunk/blender -r41100:41150
Diffstat (limited to 'source/blender/blenkernel/intern/particle_system.c')
| -rw-r--r-- | source/blender/blenkernel/intern/particle_system.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index 54af061dedb..66850238284 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -69,7 +69,6 @@ #include "BLI_listbase.h" #include "BLI_threads.h" #include "BLI_storage.h" /* For _LARGEFILE64_SOURCE; zlib needs this on some systems */ -#include "BLI_string.h" #include "BLI_utildefines.h" #include "BLI_edgehash.h" |