Removing a lot of now redundant static casts

Somotaw · Aug 29, 2013 · 155c336 · 155c336
1 parent 9822500
commit 155c336
Show file tree

Hide file tree

Showing 67 changed files with 185 additions and 185 deletions.
diff --git a/Components/Overlay/src/OgreBorderPanelOverlayElement.cpp b/Components/Overlay/src/OgreBorderPanelOverlayElement.cpp
@@ -487,7 +487,7 @@ namespace Ogre {
     void BorderPanelOverlayElement::setBorderMaterialName(const String& name)
     {
         mBorderMaterialName = name;
-        mBorderMaterial = MaterialManager::getSingleton().getByName(name).staticCast<Material>();
+        mBorderMaterial = MaterialManager::getSingleton().getByName(name);
         if (mBorderMaterial.isNull())
 			OGRE_EXCEPT( Exception::ERR_ITEM_NOT_FOUND, "Could not find material " + name,
 				"BorderPanelOverlayElement::setBorderMaterialName" );

diff --git a/Components/Overlay/src/OgreFont.cpp b/Components/Overlay/src/OgreFont.cpp
@@ -168,7 +168,7 @@ namespace Ogre
     {
         // Create a new material
         mMaterial =  MaterialManager::getSingleton().create(
-			"Fonts/" + mName,  mGroup).staticCast<Material>();
+            "Fonts/" + mName,  mGroup);
 
 		if (mMaterial.isNull())
         {
@@ -236,7 +236,7 @@ namespace Ogre
 		String texName = mName + "Texture";
 		// Create, setting isManual to true and passing self as loader
 		mTexture = TextureManager::getSingleton().create(
-			texName, mGroup, true, this).staticCast<Texture>();
+			texName, mGroup, true, this);
 		mTexture->setTextureType(TEX_TYPE_2D);
 		mTexture->setNumMipmaps(0);
 		mTexture->load();

diff --git a/Components/Overlay/src/OgreFontManager.cpp b/Components/Overlay/src/OgreFontManager.cpp
@@ -114,7 +114,7 @@ namespace Ogre
 						// chop off the 'particle_system ' needed by new compilers
 						line = line.substr(5);
 					}
-					pFont = createResource(line, groupName).staticCast<Font>();
+					pFont = create(line, groupName);
 					pFont->_notifyOrigin(stream->getName());
 				    // Skip to and over next {
                     stream->skipLine("{");

diff --git a/Components/Overlay/src/OgreOverlayElement.cpp b/Components/Overlay/src/OgreOverlayElement.cpp
@@ -322,7 +322,7 @@ namespace Ogre {
         mMaterialName = matName;
 		if (matName != StringUtil::BLANK)
 		{
-			mMaterial = MaterialManager::getSingleton().getByName(matName).staticCast<Material>();
+			mMaterial = MaterialManager::getSingleton().getByName(matName);
 			if (mMaterial.isNull())
 				OGRE_EXCEPT( Exception::ERR_ITEM_NOT_FOUND, "Could not find material " + matName,
 					"OverlayElement::setMaterialName" );

diff --git a/Components/Overlay/src/OgreTextAreaOverlayElement.cpp b/Components/Overlay/src/OgreTextAreaOverlayElement.cpp
@@ -354,7 +354,7 @@ namespace Ogre {
 
     void TextAreaOverlayElement::setFontName( const String& font )
     {
-        mFont = FontManager::getSingleton().getByName( font ).staticCast<Font>();
+        mFont = FontManager::getSingleton().getByName( font );
         if (mFont.isNull())
 			OGRE_EXCEPT( Exception::ERR_ITEM_NOT_FOUND, "Could not find font " + font,
 				"TextAreaOverlayElement::setFontName" );

diff --git a/Components/Paging/src/OgreGrid2DPageStrategy.cpp b/Components/Paging/src/OgreGrid2DPageStrategy.cpp
@@ -400,10 +400,10 @@ namespace Ogre
 			}
 
 			String matName = "Ogre/G2D/Debug";
-			MaterialPtr mat = MaterialManager::getSingleton().getByName(matName).staticCast<Material>();
+			MaterialPtr mat = MaterialManager::getSingleton().getByName(matName);
 			if (mat.isNull())
 			{
-				mat = MaterialManager::getSingleton().create(matName, ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME).staticCast<Material>();
+				mat = MaterialManager::getSingleton().create(matName, ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME);
 				Pass* pass = mat->getTechnique(0)->getPass(0);
 				pass->setLightingEnabled(false);
 				pass->setVertexColourTracking(TVC_AMBIENT);

diff --git a/Components/Paging/src/OgreGrid3DPageStrategy.cpp b/Components/Paging/src/OgreGrid3DPageStrategy.cpp
@@ -362,10 +362,10 @@ namespace Ogre
 
             //--- Get a material
 			String matName = "Ogre/G3D/Debug";
-			MaterialPtr mat = MaterialManager::getSingleton().getByName(matName).staticCast<Material>();
+			MaterialPtr mat = MaterialManager::getSingleton().getByName(matName);
 			if (mat.isNull())
 			{
-				mat = MaterialManager::getSingleton().create(matName, ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME).staticCast<Material>();
+				mat = MaterialManager::getSingleton().create(matName, ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME);
 				Pass* pass = mat->getTechnique(0)->getPass(0);
 				pass->setLightingEnabled(false);
 				pass->setVertexColourTracking(TVC_AMBIENT);

diff --git a/Components/RTShaderSystem/src/OgreShaderGenerator.cpp b/Components/RTShaderSystem/src/OgreShaderGenerator.cpp
@@ -719,7 +719,7 @@ bool ShaderGenerator::createShaderBasedTechnique(const String& materialName,
     OGRE_LOCK_AUTO_MUTEX;
 
 	// Make sure material exists.
-	MaterialPtr srcMat = MaterialManager::getSingleton().getByName(materialName, groupName).staticCast<Material>();
+	MaterialPtr srcMat = MaterialManager::getSingleton().getByName(materialName, groupName);
 	if (srcMat.isNull() == true)
 		return false;
 
@@ -913,8 +913,8 @@ bool ShaderGenerator::cloneShaderBasedTechniques(const String& srcMaterialName,
 	//
 
 	// Make sure material exists.
-	MaterialPtr srcMat = MaterialManager::getSingleton().getByName(srcMaterialName, srcGroupName).staticCast<Material>();
-	MaterialPtr dstMat = MaterialManager::getSingleton().getByName(dstMaterialName, dstGroupName).staticCast<Material>();
+	MaterialPtr srcMat = MaterialManager::getSingleton().getByName(srcMaterialName, srcGroupName);
+	MaterialPtr dstMat = MaterialManager::getSingleton().getByName(dstMaterialName, dstGroupName);
 	if ((srcMat.isNull() == true) || (dstMat.isNull() == true) || (srcMat == dstMat))
 		return false;
 
@@ -1035,7 +1035,7 @@ void ShaderGenerator::removeAllShaderBasedTechniques()
  Technique* ShaderGenerator::findSourceTechnique(const String& materialName, 
 				const String& groupName, const String& srcTechniqueSchemeName, bool allowProgrammable)
  {
-	 MaterialPtr mat = MaterialManager::getSingleton().getByName(materialName, groupName).staticCast<Material>();
+     MaterialPtr mat = MaterialManager::getSingleton().getByName(materialName, groupName);
 	 Material::TechniqueIterator itMatTechniques = mat->getTechniqueIterator();
 
 
@@ -1648,7 +1648,7 @@ ShaderGenerator::SGTechnique::~SGTechnique()
 
 	if (MaterialManager::getSingleton().resourceExists(materialName))
 	{
-		MaterialPtr mat = MaterialManager::getSingleton().getByName(materialName, groupName).staticCast<Material>();
+		MaterialPtr mat = MaterialManager::getSingleton().getByName(materialName, groupName);
 
 		// Remove the destination technique from parent material.
 		for (unsigned int i=0; i < mat->getNumTechniques(); ++i)

diff --git a/Components/RTShaderSystem/src/OgreShaderMaterialSerializerListener.cpp b/Components/RTShaderSystem/src/OgreShaderMaterialSerializerListener.cpp
@@ -52,7 +52,7 @@ void SGMaterialSerializerListener::materialEventRaised(MaterialSerializer* ser,
 {
 	if (event == MaterialSerializer::MSE_PRE_WRITE)
 	{
-		MaterialPtr matPtr = MaterialManager::getSingleton().getByName(mat->getName()).staticCast<Material>();
+		MaterialPtr matPtr = MaterialManager::getSingleton().getByName(mat->getName());
 		mSourceMaterial = matPtr.get();
 		createSGPassList(mSourceMaterial, mSGPassList);
 	}

diff --git a/Components/RTShaderSystem/src/OgreShaderProgramManager.cpp b/Components/RTShaderSystem/src/OgreShaderProgramManager.cpp
@@ -410,14 +410,14 @@ GpuProgramPtr ProgramManager::createGpuProgram(Program* shaderProgram,
 	}
 
 	// Try to get program by name.
-	HighLevelGpuProgramPtr pGpuProgram = HighLevelGpuProgramManager::getSingleton().getByName(programName).staticCast<HighLevelGpuProgram>();
+	HighLevelGpuProgramPtr pGpuProgram = HighLevelGpuProgramManager::getSingleton().getByName(programName);
 
 	// Case the program doesn't exist yet.
 	if (pGpuProgram.isNull())
 	{
 		// Create new GPU program.
 		pGpuProgram = HighLevelGpuProgramManager::getSingleton().createProgram(programName,
-			ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME, language, shaderProgram->getType()).staticCast<HighLevelGpuProgram>();
+			ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME, language, shaderProgram->getType());
 
 		// Case cache directory specified -> create program from file.
 		if (cachePath.empty() == false)

diff --git a/Components/Terrain/src/OgreTerrainMaterialGeneratorA.cpp b/Components/Terrain/src/OgreTerrainMaterialGeneratorA.cpp
@@ -258,10 +258,10 @@ namespace Ogre
 			// it's important that the names are deterministic for a given terrain, so
 			// use the terrain pointer as an ID
 			const String& matName = terrain->getMaterialName();
-			mat = matMgr.getByName(matName).staticCast<Material>();
+			mat = matMgr.getByName(matName);
 			if (mat.isNull())
 			{
-				mat = matMgr.create(matName, ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME).staticCast<Material>();
+				mat = matMgr.create(matName, ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME);
 			}
 		}
 		// clear everything
@@ -308,10 +308,10 @@ namespace Ogre
 			// it's important that the names are deterministic for a given terrain, so
 			// use the terrain pointer as an ID
 			const String& matName = terrain->getMaterialName() + "/comp";
-			mat = matMgr.getByName(matName).staticCast<Material>();
+			mat = matMgr.getByName(matName);
 			if (mat.isNull())
 			{
-				mat = matMgr.create(matName, ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME).staticCast<Material>();
+				mat = matMgr.create(matName, ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME);
 			}
 		}
 		// clear everything

diff --git a/Components/Terrain/src/OgreTerrainMaterialShaderHelperCg.cpp b/Components/Terrain/src/OgreTerrainMaterialShaderHelperCg.cpp
@@ -40,11 +40,11 @@ namespace Ogre
 	{
 		HighLevelGpuProgramManager& mgr = HighLevelGpuProgramManager::getSingleton();
 		String progName = getVertexProgramName(prof, terrain, tt);
-		HighLevelGpuProgramPtr ret = mgr.getByName(progName).staticCast<HighLevelGpuProgram>();
+		HighLevelGpuProgramPtr ret = mgr.getByName(progName);
 		if (ret.isNull())
 		{
 			ret = mgr.createProgram(progName, ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME, 
-				"cg", GPT_VERTEX_PROGRAM).staticCast<HighLevelGpuProgram>();
+				"cg", GPT_VERTEX_PROGRAM);
 		}
 		else
 		{
@@ -65,11 +65,11 @@ namespace Ogre
 		HighLevelGpuProgramManager& mgr = HighLevelGpuProgramManager::getSingleton();
 		String progName = getFragmentProgramName(prof, terrain, tt);
 
-		HighLevelGpuProgramPtr ret = mgr.getByName(progName).staticCast<HighLevelGpuProgram>();
+		HighLevelGpuProgramPtr ret = mgr.getByName(progName);
 		if (ret.isNull())
 		{
 			ret = mgr.createProgram(progName, ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME, 
-				"cg", GPT_FRAGMENT_PROGRAM).staticCast<HighLevelGpuProgram>();
+				"cg", GPT_FRAGMENT_PROGRAM);
 		}
 		else
 		{

diff --git a/Components/Terrain/src/OgreTerrainMaterialShaderHelperGLSL.cpp b/Components/Terrain/src/OgreTerrainMaterialShaderHelperGLSL.cpp
@@ -42,11 +42,11 @@ namespace Ogre
         HighLevelGpuProgramManager& mgr = HighLevelGpuProgramManager::getSingleton();
         String progName = getVertexProgramName(prof, terrain, tt);
 
-        HighLevelGpuProgramPtr ret = mgr.getByName(progName).staticCast<HighLevelGpuProgram>();
+        HighLevelGpuProgramPtr ret = mgr.getByName(progName);
         if (ret.isNull())
         {
             ret = mgr.createProgram(progName, ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME, 
-                "glsl", GPT_VERTEX_PROGRAM).staticCast<HighLevelGpuProgram>();
+                "glsl", GPT_VERTEX_PROGRAM);
         }
         else
         {
@@ -63,11 +63,11 @@ namespace Ogre
         HighLevelGpuProgramManager& mgr = HighLevelGpuProgramManager::getSingleton();
         String progName = getFragmentProgramName(prof, terrain, tt);
 
-        HighLevelGpuProgramPtr ret = mgr.getByName(progName).staticCast<HighLevelGpuProgram>();
+        HighLevelGpuProgramPtr ret = mgr.getByName(progName);
         if (ret.isNull())
         {
             ret = mgr.createProgram(progName, ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME, 
-                "glsl", GPT_FRAGMENT_PROGRAM).staticCast<HighLevelGpuProgram>();
+                "glsl", GPT_FRAGMENT_PROGRAM);
         }
         else
         {

diff --git a/Components/Terrain/src/OgreTerrainMaterialShaderHelperGLSLES.cpp b/Components/Terrain/src/OgreTerrainMaterialShaderHelperGLSLES.cpp
@@ -42,11 +42,11 @@ namespace Ogre
         HighLevelGpuProgramManager& mgr = HighLevelGpuProgramManager::getSingleton();
         String progName = getVertexProgramName(prof, terrain, tt);
 
-        HighLevelGpuProgramPtr ret = mgr.getByName(progName).staticCast<HighLevelGpuProgram>();
+        HighLevelGpuProgramPtr ret = mgr.getByName(progName);
         if (ret.isNull())
         {
             ret = mgr.createProgram(progName, ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME, 
-                "glsles", GPT_VERTEX_PROGRAM).staticCast<HighLevelGpuProgram>();
+                "glsles", GPT_VERTEX_PROGRAM);
         }
         else
         {
@@ -63,11 +63,11 @@ namespace Ogre
         HighLevelGpuProgramManager& mgr = HighLevelGpuProgramManager::getSingleton();
         String progName = getFragmentProgramName(prof, terrain, tt);
 
-        HighLevelGpuProgramPtr ret = mgr.getByName(progName).staticCast<HighLevelGpuProgram>();
+        HighLevelGpuProgramPtr ret = mgr.getByName(progName);
         if (ret.isNull())
         {
             ret = mgr.createProgram(progName, ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME, 
-                "glsles", GPT_FRAGMENT_PROGRAM).staticCast<HighLevelGpuProgram>();
+                "glsles", GPT_FRAGMENT_PROGRAM);
         }
         else
         {

diff --git a/Components/Terrain/src/OgreTerrainMaterialShaderHelperHLSL.cpp b/Components/Terrain/src/OgreTerrainMaterialShaderHelperHLSL.cpp
@@ -41,11 +41,11 @@ namespace Ogre
 		HighLevelGpuProgramManager& mgr = HighLevelGpuProgramManager::getSingleton();
 		String progName = getVertexProgramName(prof, terrain, tt);
 
-		HighLevelGpuProgramPtr ret = mgr.getByName(progName).staticCast<HighLevelGpuProgram>();
+		HighLevelGpuProgramPtr ret = mgr.getByName(progName);
 		if (ret.isNull())
 		{
 			ret = mgr.createProgram(progName, ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME, 
-				"hlsl", GPT_VERTEX_PROGRAM).staticCast<HighLevelGpuProgram>();
+				"hlsl", GPT_VERTEX_PROGRAM);
 		}
 		else
 		{
@@ -72,11 +72,11 @@ namespace Ogre
 		String progName = getFragmentProgramName(prof, terrain, tt);
 
 
-		HighLevelGpuProgramPtr ret = mgr.getByName(progName).staticCast<HighLevelGpuProgram>();
+		HighLevelGpuProgramPtr ret = mgr.getByName(progName);
 		if (ret.isNull())
 		{
 			ret = mgr.createProgram(progName, ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME, 
-				"hlsl", GPT_FRAGMENT_PROGRAM).staticCast<HighLevelGpuProgram>();
+				"hlsl", GPT_FRAGMENT_PROGRAM);
 		}
 		else
 		{

diff --git a/OgreMain/src/OgreBillboardChain.cpp b/OgreMain/src/OgreBillboardChain.cpp
@@ -729,15 +729,15 @@ namespace Ogre {
 	void BillboardChain::setMaterialName( const String& name, const String& groupName /* = ResourceGroupManager::AUTODETECT_RESOURCE_GROUP_NAME */)
 	{
 		mMaterialName = name;
-		mMaterial = MaterialManager::getSingleton().getByName(mMaterialName, groupName).staticCast<Material>();
+		mMaterial = MaterialManager::getSingleton().getByName(mMaterialName, groupName);
 
 		if (mMaterial.isNull())
 		{
 			LogManager::getSingleton().logMessage("Can't assign material " + name +
 				" to BillboardChain " + mName + " because this "
 				"Material does not exist. Have you forgotten to define it in a "
 				".material script?");
-			mMaterial = MaterialManager::getSingleton().getByName("BaseWhiteNoLighting").staticCast<Material>();
+			mMaterial = MaterialManager::getSingleton().getByName("BaseWhiteNoLighting");
 			if (mMaterial.isNull())
 			{
 				OGRE_EXCEPT(Exception::ERR_INTERNAL_ERROR, "Can't assign default material "

diff --git a/OgreMain/src/OgreBillboardSet.cpp b/OgreMain/src/OgreBillboardSet.cpp
@@ -305,7 +305,7 @@ namespace Ogre {
     {
         mMaterialName = name;
 
-        mMaterial = MaterialManager::getSingleton().getByName(name, groupName).staticCast<Material>();
+        mMaterial = MaterialManager::getSingleton().getByName(name, groupName);
 
 		if (mMaterial.isNull())
 			OGRE_EXCEPT( Exception::ERR_ITEM_NOT_FOUND, "Could not find material " + name,
@@ -654,7 +654,7 @@ namespace Ogre {
                                                   "Material does not exist. Have you forgotten to define it in a "
                                                   ".material script?");
 
-            mMaterial = MaterialManager::getSingleton().getByName("BaseWhite").staticCast<Material>();
+			mMaterial = MaterialManager::getSingleton().getByName("BaseWhite");
 
             if (mMaterial.isNull())
             {

diff --git a/OgreMain/src/OgreCompositionPass.cpp b/OgreMain/src/OgreCompositionPass.cpp
@@ -91,7 +91,7 @@ void CompositionPass::setMaterial(const MaterialPtr& mat)
 //-----------------------------------------------------------------------
 void CompositionPass::setMaterialName(const String &name)
 {
-    mMaterial = MaterialManager::getSingleton().getByName(name).staticCast<Material>();
+    mMaterial = MaterialManager::getSingleton().getByName(name);
 }
 //-----------------------------------------------------------------------
 const MaterialPtr& CompositionPass::getMaterial() const

diff --git a/OgreMain/src/OgreCompositorChain.cpp b/OgreMain/src/OgreCompositorChain.cpp
@@ -106,10 +106,10 @@ void CompositorChain::createOriginalScene()
     compName += StringConverter::toString((size_t)mViewport);
 
 	mOriginalSceneScheme = mViewport->getMaterialScheme();
-	CompositorPtr scene = CompositorManager::getSingleton().getByName(compName, ResourceGroupManager::INTERNAL_RESOURCE_GROUP_NAME).staticCast<Compositor>();
+	CompositorPtr scene = CompositorManager::getSingleton().getByName(compName, ResourceGroupManager::INTERNAL_RESOURCE_GROUP_NAME);
 	if (scene.isNull())
 	{
-		scene = CompositorManager::getSingleton().create(compName, ResourceGroupManager::INTERNAL_RESOURCE_GROUP_NAME).staticCast<Compositor>();
+		scene = CompositorManager::getSingleton().create(compName, ResourceGroupManager::INTERNAL_RESOURCE_GROUP_NAME);
 		CompositionTechnique *t = scene->createTechnique();
 		t->setSchemeName(StringUtil::BLANK);
 		CompositionTargetPass *tp = t->getOutputTargetPass();

diff --git a/OgreMain/src/OgreCompositorInstance.cpp b/OgreMain/src/OgreCompositorInstance.cpp
@@ -585,7 +585,7 @@ static size_t dummyCounter = 0;
         MaterialManager::getSingleton().create(
             "c" + StringConverter::toString(dummyCounter) + "/" + srcName,
             ResourceGroupManager::INTERNAL_RESOURCE_GROUP_NAME
-        ).staticCast<Material>();
+        );
     ++dummyCounter;
     /// This is safe, as we hold a private reference
     /// XXX does not compile due to ResourcePtr conversion :
@@ -1016,7 +1016,7 @@ RenderTarget *CompositorInstance::getTargetForTex(const String &name)
  		if(refTexDef == 0)
   		{
  			//Still NULL. Try global search.
- 			const CompositorPtr &refComp = CompositorManager::getSingleton().getByName(texDef->refCompName).staticCast<Compositor>();
+            const CompositorPtr &refComp = CompositorManager::getSingleton().getByName(texDef->refCompName);
  			if(!refComp.isNull())
  			{
  				refTexDef = refComp->getSupportedTechnique()->getTextureDefinition(name);
@@ -1069,7 +1069,7 @@ RenderTarget *CompositorInstance::getTargetForTex(const String &name)
 			case CompositionTechnique::TS_GLOBAL:
 			{
 				//Chain and global case - the referenced compositor will know how to handle
-				const CompositorPtr& refComp = CompositorManager::getSingleton().getByName(texDef->refCompName).staticCast<Compositor>();
+				const CompositorPtr& refComp = CompositorManager::getSingleton().getByName(texDef->refCompName);
 				if(refComp.isNull())
 				{
 					OGRE_EXCEPT(Exception::ERR_ITEM_NOT_FOUND, "Referencing non-existent compositor",
@@ -1125,7 +1125,7 @@ const String &CompositorInstance::getSourceForTex(const String &name, size_t mrt
  		if(refTexDef == 0)
  		{
  			//Still NULL. Try global search.
- 			const CompositorPtr &refComp = CompositorManager::getSingleton().getByName(texDef->refCompName).staticCast<Compositor>();
+            const CompositorPtr &refComp = CompositorManager::getSingleton().getByName(texDef->refCompName);
  			if(!refComp.isNull())
  			{
  				refTexDef = refComp->getSupportedTechnique()->getTextureDefinition(texDef->refTexName);
@@ -1178,7 +1178,7 @@ const String &CompositorInstance::getSourceForTex(const String &name, size_t mrt
 			case CompositionTechnique::TS_GLOBAL:
 			{
 				//Chain and global case - the referenced compositor will know how to handle
-				const CompositorPtr& refComp = CompositorManager::getSingleton().getByName(texDef->refCompName).staticCast<Compositor>();
+				const CompositorPtr& refComp = CompositorManager::getSingleton().getByName(texDef->refCompName);
 				if(refComp.isNull())
 				{
 					OGRE_EXCEPT(Exception::ERR_ITEM_NOT_FOUND, "Referencing non-existent compositor",

diff --git a/OgreMain/src/OgreCompositorManager.cpp b/OgreMain/src/OgreCompositorManager.cpp
@@ -166,7 +166,7 @@ Renderable *CompositorManager::_getTexturedRectangle2D()
 //-----------------------------------------------------------------------
 CompositorInstance *CompositorManager::addCompositor(Viewport *vp, const String &compositor, int addPosition)
 {
-	CompositorPtr comp = getByName(compositor).staticCast<Compositor>();
+	CompositorPtr comp = getByName(compositor);
 	if(comp.isNull())
 		return 0;
 	CompositorChain *chain = getCompositorChain(vp);