[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/view AbstractView.java,1.69,1.70

[Nordholt <nor...@us...>]

Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29108

Modified Files:
	AbstractView.java 
Log Message:
fixing conflict

Index: AbstractView.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/AbstractView.java,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -d -r1.69 -r1.70
*** AbstractView.java	5 Dec 2005 17:27:41 -0000	1.69
--- AbstractView.java	5 Dec 2005 17:37:53 -0000	1.70
***************
*** 912,916 ****
            Surface s = (Surface)tempSurfaceIt.next();
            pushName(gl, s);
!           drawSurface(s);
            popName(gl);
          }
--- 912,916 ----
            Surface s = (Surface)tempSurfaceIt.next();
            pushName(gl, s);
!           drawSurface(s, false);
            popName(gl);
          }