Merge branch 'refs/heads/ninja-internal' into SnapManagerFixes

Conflicts:
	js/helper-classes/RDGE/Materials/FlatMaterial.js

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>

1 files changed, 17 insertions, 0 deletions

diff --git a/assets/shaders/Basic.frag.glsl b/assets/shaders/Basic.frag.glsl
new file mode 100644
index 00000000..a2c21afa
--- /dev/null
+++ b/assets/shaders/Basic.frag.glsl
@@ -0,0 +1,17 @@
+/* <copyright>
+This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+(c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+</copyright> */
+
+
+#ifdef GL_ES
+precision highp float;
+#endif
+
+
+uniform vec4 color;
+
+void main() {
+    gl_FragColor = color;
+}