Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Snapping_II

Conflicts:
	js/tools/Rotate3DToolBase.js
	js/tools/RotateStage3DTool.js
	js/tools/Translate3DToolBase.js
	js/tools/modifier-tool-base.js

1 files changed, 2 insertions, 1 deletions

diff --git a/assets/shaders/Cloud.frag.glsl b/assets/shaders/Cloud.frag.glsl
index 3d466a24..3f858b7a 100644
--- a/assets/shaders/Cloud.frag.glsl
+++ b/assets/shaders/Cloud.frag.glsl
@@ -18,7 +18,8 @@ varying vec2	v_texCoord0;
 void main()
 {
         vec4 c = texture2D(u_tex0, v_texCoord0);
-        c.a *= u_surfaceAlpha;
+        //c.a *= u_surfaceAlpha;
+        if ((c.r == 0.0) && (c.b == 0.0) && (c.g == 0.0) && (c.a == 1.0))  c = vec4( 0.0, 0.0, 1.0, 1.0 );
         gl_FragColor = c;
 }    
   
\ No newline at end of file