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

Conflicts:
	js/lib/geom/shape-primitive.js
	js/lib/rdge/materials/linear-gradient-material.js

1 files changed, 4 insertions, 0 deletions

diff --git a/js/lib/rdge/materials/material.js b/js/lib/rdge/materials/material.js
index 77220bf7..9f0ae6f1 100755
--- a/js/lib/rdge/materials/material.js
+++ b/js/lib/rdge/materials/material.js
@@ -233,6 +233,10 @@ var Material = function GLMaterial( world ) {
                 // animated materials should implement the update method
         };
 
+        this.fitToPrimitive = function( prim )  {
+                // some materials need to preserve an aspect ratio - or someting else.
+        };
+
         this.registerTexture = function( texture ) {
                 // the world needs to know about the texture map
                 var world = this.getWorld();