← Back to branch summary

~ubuntu-branches/ubuntu/precise/xscreensaver/precise

« back to all changes in this revision

Viewing changes to hacks/glx/mirrorblob.c

  • Committer: Bazaar Package Importer
  • Author(s): Jeremy Bicha
  • Date: 2011-05-18 15:39:48 UTC
  • mfrom: (1.1.11 upstream) (2.1.12 sid)
  • Revision ID: james.westby@ubuntu.com-20110518153948-8w0vyzy9lbiimpez
Tags: 5.13-1ubuntu1
* Merge with Debian unstable, remaining Ubuntu changes:
* debian/control:
  - Build-Depend on ubuntu-artwork
  - Add Vcs-Bzr link
  - Move xli | xloadimage xscreensaver recommends to suggests
  - Add/Update replaces with Ubuntu versions
  - Update package descriptions to list Ubuntu screensavers
* debian/rules:
  - Use /usr/share/backgrounds as image directory
  - Add translation domain to .desktop files
* debian/source_xscreensaver.py: 
  - Add apport hook
* debian/split-hacks.config:
  - Use different set of default hacks than Debian
* debian/xscreensaver.dirs
  - Install /usr/share/backgrounds. By default, settings search in
    /usr/share/backgrounds and without it, it displays an error
* debian/patches/53_XScreenSaver.ad.in.patch:
  - Use Ubuntu branding

Show diffs side-by-side

added added

removed removed

Lines of Context:
hacks/glx/mirrorblob.c
687
687
  /* Set the shading model to smooth (Gouraud shading). */
688
688
  glShadeModel (GL_SMOOTH);
689
689
 
690
 
  /* Set the clear color. */
691
 
  glClearColor( 0, 0, 0, 0 );
692
 
 
693
690
  glLightModelfv (GL_LIGHT_MODEL_AMBIENT, ambientLight);
694
691
  glLightfv (GL_LIGHT0, GL_AMBIENT, whiteLight0);
695
692
  glLightfv (GL_LIGHT0, GL_DIFFUSE, sourceLight0);