From: drumsetmonkey <abelleisle@roadrunner.com>
Date: Mon, 11 Jan 2016 12:38:33 +0000 (-0500)
Subject: Merge branch 'master' of http://github.com/tcsullivan/gamedev
X-Git-Url: https://code.bitgloo.com/?a=commitdiff_plain;h=6bf27552a564297cd8aaf1e3c24d9320438bdcc5;p=clyne%2Fgamedev.git

Merge branch 'master' of http://github.com/tcsullivan/gamedev
---

6bf27552a564297cd8aaf1e3c24d9320438bdcc5
diff --cc test.frag
index 0bb64a6,1c1e77b..083fc0b
--- a/test.frag
+++ b/test.frag
@@@ -1,10 -2,11 +2,10 @@@
  uniform sampler2D sampler;
  
  uniform int numLight;
- uniform vec2 lightLocation[10];
+ uniform vec2 lightLocation[255];
  uniform vec3 lightColor;
  uniform float amb;
 -// uniform float lightStrength;
 -//uniform float screenHeight;
 +
  void main(){
  	vec4 color = vec4(0.0f,0.0f,0.0f,0.0f);
  	for(int i = 0; i < numLight; i++){