min

examples/Demo/src/TestColorFont.h

@@ -79,7 +79,7 @@ public:
         _outer = v;
         mat.uniformBlack = _outer.toVector();
 
-        setMat(mc().cache(mat));
+        setMaterial(mc().cache(mat));
     }
 
     typedef Property<Color, const Color&, ShaderTextField, &ShaderTextField::getOuterColor, &ShaderTextField::setOuterColor>   TweenOuterColor;

examples/Demo/src/TestSignedDistanceFont.h

@@ -141,7 +141,7 @@ public:
 
         spSDFMaterial sdf = new SDFMaterial;
 
-        txt->setMat(sdf);
+        txt->setMaterial(sdf);
 
 
         addButton("scale+", "scale+");
@@ -178,7 +178,7 @@ public:
         if (id == "weight-")
             mat->offset -= 0.01f;
 
-        _txt->setMat(mat);
+        _txt->setMaterial(mat);
 
     }
 

oxygine/src/oxygine/VisualStyle.cpp

@@ -123,7 +123,7 @@ namespace oxygine
         matChanged();
     }
 
-    void VStyleActor::setMat(spSTDMaterial mat)
+    void VStyleActor::setMaterial(spSTDMaterial mat)
     {
         //if (_mat == mat)
         //    return;

oxygine/src/oxygine/VisualStyle.h

@@ -52,7 +52,7 @@ namespace oxygine
 
         bool getBounds(RectF& b) const  override { b = getDestRect();  return true; }
 
-        void                    setMat(spSTDMaterial mat);
+        void                    setMaterial(spSTDMaterial mat);
         spSTDMaterial _mat;
 
     protected: