goat3dgfx

diff src/psyspp.cc @ 24:dc5918c62a64

find changesets by author, revision, files, or words in the commit message
broken: converting to resman
author John Tsiombikas <nuclear@member.fsf.org>
date Sat, 01 Mar 2014 22:04:29 +0200
parents 7d6b667821cf
children
line diff
     1.1 --- a/src/psyspp.cc	Tue Feb 25 23:47:48 2014 +0200
     1.2 +++ b/src/psyspp.cc	Sat Mar 01 22:04:29 2014 +0200
     1.3 @@ -263,7 +263,7 @@
     1.4  unsigned int *pvidx;
     1.5  
     1.6  static ShaderProg *psdr;	// particle shader
     1.7 -static Texture2D *blank_tex;
     1.8 +static Texture *blank_tex;
     1.9  
    1.10  static inline void init_particle_draw()
    1.11  {
    1.12 @@ -312,7 +312,7 @@
    1.13  
    1.14  	// create empty texture
    1.15  	Image *img = texgen_solid(8, 8, Vector4(1, 1, 1, 1));
    1.16 -	blank_tex = new Texture2D;
    1.17 +	blank_tex = new Texture;
    1.18  	blank_tex->set_image(*img);
    1.19  	delete img;
    1.20