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

Conflicts:
	js/panels/presets/animations-presets.reel/animations-presets.js
	js/panels/presets/style-presets.reel/style-presets.js
	js/panels/presets/transitions-presets.reel/transitions-presets.js

1 files changed, 15 insertions, 17 deletions

diff --git a/js/helper-classes/RDGE/src/core/script/ScreenQuad.js b/js/helper-classes/RDGE/src/core/script/ScreenQuad.js
index 2368d97a..6359f82e 100755
--- a/js/helper-classes/RDGE/src/core/script/ScreenQuad.js
+++ b/js/helper-classes/RDGE/src/core/script/ScreenQuad.js
@@ -4,28 +4,26 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.

 </copyright> */

 

+// RDGE namespaces

+var RDGE = RDGE || {};

 

-function ScreenQuad(texture)

-{

-  this.vertBuffer = null;

-  this.uvBuffer = null;

-  this.texture  = texture;

-  this.shader   = null;

-  this.renderObj  = null;

-}

+RDGE.ScreenQuad = function (texture) {

+    this.vertBuffer = null;

+    this.uvBuffer = null;

+    this.texture = texture;

+    this.shader = null;

+    this.renderObj = null;

+};

 

-ScreenQuad.prototype.initialize = function(initProc, shaderOpt)

-{

-  initProc(this, shaderOpt);

+RDGE.ScreenQuad.prototype.initialize = function (initProc, shaderOpt) {

+    initProc(this, shaderOpt);

 };

 

-ScreenQuad.prototype.setTexture = function(texture)

-{

-  this.texture = texture;

+RDGE.ScreenQuad.prototype.setTexture = function (texture) {

+    this.texture = texture;

 };

 

 

-ScreenQuad.prototype.render = function(renderProc)

-{

-  renderProc(this);

+RDGE.ScreenQuad.prototype.render = function (renderProc) {

+    renderProc(this);

 };
\ No newline at end of file