← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/blender/gutsy-security

« back to all changes in this revision

Viewing changes to source/blender/src/glutil.c

  • Committer: Bazaar Package Importer
  • Author(s): Florian Ernst
  • Date: 2007-05-17 11:47:59 UTC
  • mfrom: (1.2.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20070517114759-yp4ybrnhp2u7pk66
Tags: 2.44-1
* New upstream release.
* Drop debian/patches/01_64bits_stupidity, not needed anymore: as of this
  version blender is 64 bits safe again. Adjust README.Debian accordingly.

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/src/glutil.c
1
1
 
2
2
 
3
3
/**
4
 
 * $Id: glutil.c,v 1.29 2007/01/17 03:57:01 nicholasbishop Exp $
 
4
 * $Id: glutil.c,v 1.31 2007/03/17 14:15:02 khughes Exp $
5
5
 *
6
6
 * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
7
7
 *
232
232
                GLint ltexid= glaGetOneInteger(GL_TEXTURE_2D);
233
233
                unsigned char *tbuf;
234
234
 
235
 
                glGenTextures(1, &texid);
 
235
                glGenTextures(1, (GLuint *)&texid);
236
236
 
237
237
                glBindTexture(GL_TEXTURE_2D, texid);
238
238
 
661
661
        }
662
662
}
663
663
 
664
 
static int is_a_really_crappy_intel_card(void)
 
664
int is_a_really_crappy_intel_card(void)
665
665
{
666
666
        static int well_is_it= -1;
667
667