Merge pull request #1718 from Azaezel/reportAug

file name reporting for 'sampler not defined' and rtParams error reports.

Engine/source/materials/shaderData.cpp

@@ -365,7 +365,7 @@ bool ShaderData::_checkDefinition(GFXShader *shader)
       {              
          if( !shader->findShaderConstHandle( String::ToString("$rtParams%d", pos)) )
          {
-            String error = String::ToString("ShaderData(%s) sampler[%d] used but rtParams%d not used in shader compilation. Possible error", getName(), pos, pos);
+            String error = String::ToString("ShaderData(%s) sampler[%d] used but rtParams%d not used in shader compilation. Possible error", shader->getPixelShaderFile().c_str(), pos, pos);
             Con::errorf( error );
             error = true;
          }
@@ -373,7 +373,7 @@ bool ShaderData::_checkDefinition(GFXShader *shader)
 
       if(!find)
       {
-         String error = String::ToString("ShaderData(%s) sampler %s not defined", getName(), samplers[i].c_str());
+         String error = String::ToString("ShaderData(%s) sampler %s not defined", shader->getPixelShaderFile().c_str(), samplers[i].c_str());
          Con::errorf(error );
          GFXAssertFatal(0, error );
          error = true;