ftp://ftp.swin.edu.au/slackware/slackware-9.1/source/xap/xscreensaver/xscreensaver...

[xscreensaver] / hacks / glx / blocktube.c

diff --git a/hacks/glx/blocktube.c b/hacks/glx/blocktube.c
index 2542973a9e047cce05b042b6ff434f19194a1531..f32c7b1e4a0d56241beebc06351f5f02eef381c3 100644 (file)
--- a/hacks/glx/blocktube.c
+++ b/hacks/glx/blocktube.c
@@ -127,6 +127,7 @@ ModStruct blocktube_description =
      "A shifting tunnel of reflective blocks", 0, NULL};
 #endif /* USE_MODULES */
 
+#if defined( I_HAVE_XPM )
 static Bool LoadGLTextures(ModeInfo *mi)
 {
     Bool status;
@@ -135,7 +136,7 @@ static Bool LoadGLTextures(ModeInfo *mi)
     glGenTextures(1, &envTexture);
     glBindTexture(GL_TEXTURE_2D, envTexture);
     texti = xpm_to_ximage(MI_DISPLAY(mi), MI_VISUAL(mi), MI_COLORMAP(mi),
-                          envImage_xpm);
+                          blocktube_xpm);
     if (!texti) {
         status = False;
     } else {
@@ -149,6 +150,7 @@ static Bool LoadGLTextures(ModeInfo *mi)
     }
     return status;
 }
+#endif
 
 static void newTargetColor(void)
 {