diff options
author | Daniel Dunbar <daniel@zuster.org> | 2005-03-29 20:43:39 +0400 |
---|---|---|
committer | Daniel Dunbar <daniel@zuster.org> | 2005-03-29 20:43:39 +0400 |
commit | e229722d5b20c0603f0b0cf0e559a43b4c5ec546 (patch) | |
tree | da5a3b7ca09e989aa9246f5172ef7135297659a5 /source/blender/blenlib/intern | |
parent | da0a55d2b41d563385679d9beb12c26eaf7f1f63 (diff) |
- added Mesh->derived and Mesh->decimated DerivedMesh pointers
- removed DL_MESH displist type!!!! Now store a DerivedMesh directly.
- May still be some issues left having to do with releasing this
at the right time (old code just splashed free_displist all
over the place).
Diffstat (limited to 'source/blender/blenlib/intern')
-rw-r--r-- | source/blender/blenlib/intern/noise.c | 5 | ||||
-rw-r--r-- | source/blender/blenlib/intern/storage.c | 16 |
2 files changed, 9 insertions, 12 deletions
diff --git a/source/blender/blenlib/intern/noise.c b/source/blender/blenlib/intern/noise.c index 1eaff59bf7b..7797557c1f7 100644 --- a/source/blender/blenlib/intern/noise.c +++ b/source/blender/blenlib/intern/noise.c @@ -39,11 +39,6 @@ #include <config.h> #endif -#ifdef _WIN32 -#pragma warning (once : 4244) // "conversion from double to float" -#pragma warning (once : 4305) // "truncation from const double to float" -#endif - /* local */ float noise3_perlin(float vec[3]); float turbulence_perlin(float *point, float lofreq, float hifreq); diff --git a/source/blender/blenlib/intern/storage.c b/source/blender/blenlib/intern/storage.c index c937fa02b43..50ac321d353 100644 --- a/source/blender/blenlib/intern/storage.c +++ b/source/blender/blenlib/intern/storage.c @@ -321,7 +321,6 @@ void BLI_adddirstrings() struct direntry * file; struct tm *tm; time_t zero= 0; - struct passwd *pwuser; file = &files[0]; @@ -356,12 +355,15 @@ void BLI_adddirstrings() #ifdef WIN32 strcpy(files[num].owner,"user"); #else - pwuser = getpwuid(files[num].s.st_uid); - if ( pwuser ) { - strcpy(files[num].owner, pwuser->pw_name); - } else { - sprintf(files[num].owner, "%d", files[num].s.st_uid); - } + { + struct passwd *pwuser; + pwuser = getpwuid(files[num].s.st_uid); + if ( pwuser ) { + strcpy(files[num].owner, pwuser->pw_name); + } else { + sprintf(files[num].owner, "%d", files[num].s.st_uid); + } + } #endif tm= localtime(&files[num].s.st_mtime); |