bprocessor-commit

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

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

Modified Files:
	View.java 
Log Message:
sorting out conflicts on target coloring

Index: View.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/View.java,v
retrieving revision 1.82
retrieving revision 1.83
diff -C2 -d -r1.82 -r1.83
*** View.java	3 May 2006 09:59:19 -0000	1.82
--- View.java	3 May 2006 10:11:25 -0000	1.83
***************
*** 704,710 ****
      }
      
!     
      if (target != null) {
!       gl.glColor3fv(targetColor);
        drawObject(target);
      }
--- 704,714 ----
      }
      
!     // draw target
      if (target != null) {
!       if (colorMap.containsKey(target)) {
!         gl.glColor3fv((float[])colorMap.get(target));
!       } else {
!         gl.glColor3fv(targetColor);
!       }
        drawObject(target);
      }