Merge branch 'refs/heads/NINJA-master' into TimelineUber

Conflicts:
	js/panels/Timeline/DragDrop.js
	js/panels/Timeline/Keyframe.reel/Keyframe.js
	js/panels/Timeline/Layer.reel/Layer.js
	js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
	js/panels/Timeline/Span.reel/Span.js
	js/panels/Timeline/Style.reel/Style.js
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
	js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
	js/panels/Timeline/Track.reel/Track.html
	js/panels/Timeline/Track.reel/Track.js
	js/panels/Timeline/Track.reel/css/Track.css
	js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html
	js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js
	js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css
	js/panels/Timeline/Tween.reel/Tween.js

Signed-off-by: Jonathan Duran <jduran@motorola.com>

1 files changed, 43 insertions, 42 deletions

diff --git a/assets/shaders/test_vshader.glsl b/assets/shaders/test_vshader.glsl
index 8bf9ee74..39e3f6ff 100755
--- a/assets/shaders/test_vshader.glsl
+++ b/assets/shaders/test_vshader.glsl
@@ -1,24 +1,25 @@
 /* <copyright>
-Copyright (c) 2012, Motorola Mobility, Inc
+Copyright (c) 2012, Motorola Mobility LLC.
 All Rights Reserved.
-BSD License.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
 
-  - Redistributions of source code must retain the above copyright notice,
-    this list of conditions and the following disclaimer.
-  - Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-  - Neither the name of Motorola Mobility nor the names of its contributors
-    may be used to endorse or promote products derived from this software
-    without specific prior written permission.
+* Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of Motorola Mobility LLC nor the names of its
+  contributors may be used to endorse or promote products derived from this
+  software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
 LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
@@ -46,8 +47,8 @@ uniform mat4 u_vShadowLight;
 uniform vec3 u_lightPos;
 
 // varyings
-varying vec4 vNormal;   // w = texcoord.x
-varying vec4 vECPos;    // w = texcoord.y
+varying vec4 vNormal;   // w = texcoord.x
+varying vec4 vECPos;    // w = texcoord.y
 varying vec3 vEyePos;
 varying vec4 vShadowCoord;
 varying vec2 vEnvTexCoord;
@@ -56,18 +57,18 @@ varying float vDiffuseIntensity;
 #ifdef PC
 void main()
 {
-        vNormal.w       = texcoord.x;
-        vECPos.w                = texcoord.y;
+    vNormal.w       = texcoord.x;
+    vECPos.w        = texcoord.y;
     vEyePos         = u_eye;
 
-//      position normals and vert
-        vECPos.xyz      = (u_mvMatrix*vec4(vert, 1.0)).xyz;
-        vNormal.xyz = (u_normalMatrix*vec4(normal, 0.0)).xyz;
+//  position normals and vert
+    vECPos.xyz  = (u_mvMatrix*vec4(vert, 1.0)).xyz;
+    vNormal.xyz = (u_normalMatrix*vec4(normal, 0.0)).xyz;
 
-//      pass along the geo
-        gl_Position     = u_projMatrix * vec4(vECPos.xyz, 1.0);
-        
-        mat4 shadowMat  = u_shadowBiasMatrix*u_projMatrix*u_vShadowLight*u_worldMatrix;
+//  pass along the geo
+    gl_Position = u_projMatrix * vec4(vECPos.xyz, 1.0);
+
+    mat4 shadowMat  = u_shadowBiasMatrix*u_projMatrix*u_vShadowLight*u_worldMatrix;
      vShadowCoord    = shadowMat * vec4(vert, 1.0);
 }
 #endif
@@ -76,31 +77,31 @@ void main()
 
 void main()
 {
-        vNormal.w       = texcoord.x;
-        vECPos.w                = texcoord.y;
+    vNormal.w       = texcoord.x;
+    vECPos.w        = texcoord.y;
     vEyePos         = u_eye;
 
-//      position normals and vert
-        vECPos.xyz      = (u_mvMatrix*vec4(vert, 1.0)).xyz;
-        vNormal.xyz = (u_normalMatrix*vec4(normal, 0.0)).xyz;
+//  position normals and vert
+    vECPos.xyz  = (u_mvMatrix*vec4(vert, 1.0)).xyz;
+    vNormal.xyz = (u_normalMatrix*vec4(normal, 0.0)).xyz;
+
+//  pass along the geo
+    gl_Position = u_projMatrix * vec4(vECPos.xyz, 1.0);
 
-//      pass along the geo
-        gl_Position     = u_projMatrix * vec4(vECPos.xyz, 1.0);
-        
-        //mat4 shadowMat  = u_shadowBiasMatrix*u_projMatrix*u_vShadowLight*u_worldMatrix;
+    //mat4 shadowMat  = u_shadowBiasMatrix*u_projMatrix*u_vShadowLight*u_worldMatrix;
     //vShadowCoord    = shadowMat * vec4(vert, 1.0);
-     
+
     // normal mapping
-        vec3 normal = normalize(vNormal.xyz);
-
-        // create envmap coordinates
-        vec3 r = reflect( vec3(vECPos.xyz - u_eye.xyz), normal);
-        float m = 2.0 * length(r);
-        vEnvTexCoord = vec2(r.x/m + 0.5, r.y/m + 0.5);
-        
-        vec3 lightDirection = normalize(u_lightPos - vECPos.xyz);
-        vDiffuseIntensity = max(0.0, dot(normal, lightDirection));
-        
+    vec3 normal = normalize(vNormal.xyz);
+
+    // create envmap coordinates
+    vec3 r = reflect( vec3(vECPos.xyz - u_eye.xyz), normal);
+    float m = 2.0 * length(r);
+    vEnvTexCoord = vec2(r.x/m + 0.5, r.y/m + 0.5);
+
+    vec3 lightDirection = normalize(u_lightPos - vECPos.xyz);
+    vDiffuseIntensity = max(0.0, dot(normal, lightDirection));
+
 }
 
 #endif