--- a/Aquaria/Game.cpp	Fri Apr 15 00:46:44 2011 +0900
+++ b/Aquaria/Game.cpp	Fri Apr 15 21:08:40 2011 +0900
@@ -6125,7 +6125,7 @@
 		if (i == LR_ELEMENTS11)
 			continue;
 
-		dsq->getRenderObjectLayer(i)->setOptimizeStatic(!isSceneEditorActive());
+		dsq->getRenderObjectLayer(i)->setOptimizeStatic(!isSceneEditorActive() && dsq->user.video.displaylists);
 	}
 }
 

--- a/Aquaria/UserSettings.cpp	Fri Apr 15 00:46:44 2011 +0900
+++ b/Aquaria/UserSettings.cpp	Fri Apr 15 21:08:40 2011 +0900
@@ -129,6 +129,7 @@
 				xml_screenMode.SetAttribute("vsync",			video.vsync);
 				xml_screenMode.SetAttribute("darkfbuffer",		video.darkfbuffer);
 				xml_screenMode.SetAttribute("darkbuffersize",	video.darkbuffersize);
+				xml_screenMode.SetAttribute("displaylists",		video.displaylists);
 			}
 			xml_video.InsertEndChild(xml_screenMode);
 
@@ -531,6 +532,7 @@
 			readIntAtt(xml_screenMode, "vsync",				&video.vsync);
 			readIntAtt(xml_screenMode, "darkfbuffer",		&video.darkfbuffer);
 			readIntAtt(xml_screenMode, "darkbuffersize",	&video.darkbuffersize);
+			readIntAtt(xml_screenMode, "displaylists",		&video.displaylists);
 		}
 
 		readInt(xml_video, "SaveSlotScreens", "on", &video.saveSlotScreens);

--- a/Aquaria/UserSettings.h	Fri Apr 15 00:46:44 2011 +0900
+++ b/Aquaria/UserSettings.h	Fri Apr 15 21:08:40 2011 +0900
@@ -109,6 +109,7 @@
 			bits = 32;
 			vsync = 1;
 			darkbuffersize = 256;
+			displaylists = 1;
 		}
 		int shader;
 		int blur;
@@ -118,6 +119,7 @@
 		int saveSlotScreens;
 		int parallaxOn0, parallaxOn1, parallaxOn2;
 		int numParticles;
+		int displaylists;
 	} video;
 
 	struct Control