- 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).

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);