Goes and replaces the references/names that use Prepass to be Deferred, since we're actually using deferred.

Engine/source/materials/baseMatInstance.h

@@ -77,7 +77,7 @@ protected:
    /// It is up to the derived class to set this variable appropriately.
    bool mIsValid;
 
-   /// This is set by initialization and used by the prepass.
+   /// This is set by initialization and used by the deferred.
    bool mHasNormalMaps;
 
    /// This material makes use of bone transforms

Engine/source/materials/materialFeatureTypes.cpp

@@ -73,13 +73,13 @@ ImplementFeatureType( MFT_IsEmissive, U32(-1), -1, true );
 ImplementFeatureType( MFT_GlossMap, U32(-1), -1, true );
 ImplementFeatureType( MFT_DiffuseMapAtlas, U32(-1), -1, true );
 ImplementFeatureType( MFT_NormalMapAtlas, U32(-1), -1, true );
-ImplementFeatureType( MFT_InterlacedPrePass, U32(-1), -1, true );
+ImplementFeatureType( MFT_InterlacedDeferred, U32(-1), -1, true );
 
 ImplementFeatureType( MFT_ParaboloidVertTransform, MFG_Transform, -1, false );
 ImplementFeatureType( MFT_IsSinglePassParaboloid, U32(-1), -1, false );
 ImplementFeatureType( MFT_EyeSpaceDepthOut, MFG_PostLighting, 2.0f, false );
 ImplementFeatureType( MFT_DepthOut, MFG_PostLighting, 3.0f, false );
-ImplementFeatureType( MFT_PrePassConditioner, MFG_PostProcess, 1.0f, false );
+ImplementFeatureType( MFT_DeferredConditioner, MFG_PostProcess, 1.0f, false );
 ImplementFeatureType( MFT_NormalsOut, MFG_PreLighting, 1.0f, false );
 
 ImplementFeatureType( MFT_LightbufferMRT, MFG_PreLighting, 1.0f, false );

Engine/source/materials/materialFeatureTypes.h

@@ -150,8 +150,8 @@ DeclareFeatureType( MFT_Fog );
 DeclareFeatureType( MFT_HDROut );
 
 ///
-DeclareFeatureType( MFT_PrePassConditioner );
-DeclareFeatureType( MFT_InterlacedPrePass );
+DeclareFeatureType( MFT_DeferredConditioner );
+DeclareFeatureType( MFT_InterlacedDeferred );
 
 /// This feature causes MFT_ToneMap and MFT_LightMap to output their light color
 /// to the second render-target

Engine/source/materials/materialManager.cpp

@@ -68,7 +68,7 @@ MaterialManager::MaterialManager()
 
    mMaterialSet = NULL;
 
-   mUsingPrePass = false;
+   mUsingDeferred = false;
 
    mFlushAndReInit = false;
 

Engine/source/materials/materialManager.h

@@ -79,11 +79,11 @@ public:
    /// Gets the global warning material instance, callers should not free this copy
    BaseMatInstance * getWarningMatInstance();
 
-   /// Set the prepass enabled state.
-   void setPrePassEnabled( bool enabled ) { mUsingPrePass = enabled; }
+   /// Set the deferred enabled state.
+   void setDeferredEnabled( bool enabled ) { mUsingDeferred = enabled; }
 
-   /// Get the prepass enabled state.
-   bool getPrePassEnabled() const { return mUsingPrePass; }
+   /// Get the deferred enabled state.
+   bool getDeferredEnabled() const { return mUsingDeferred; }
 
 #ifndef TORQUE_SHIPPING
 
@@ -153,7 +153,7 @@ protected:
    typedef Map<String, String> MaterialMap;
    MaterialMap mMaterialMap;
 
-   bool mUsingPrePass;
+   bool mUsingDeferred;
 
    // time tracking
    F32 mDt;

Engine/source/materials/processedMaterial.cpp

@@ -288,9 +288,9 @@ void ProcessedMaterial::_initPassStateBlock( RenderPassData *rpd, GFXStateBlockD
       }
    }
 
-   // The prepass will take care of writing to the 
+   // The deferred will take care of writing to the 
    // zbuffer, so we don't have to by default.
-   if (  MATMGR->getPrePassEnabled() && 
+   if (  MATMGR->getDeferredEnabled() && 
          !mFeatures.hasFeature(MFT_ForwardShading))
       result.setZReadWrite( result.zEnable, false );
 
@@ -350,7 +350,7 @@ U32 ProcessedMaterial::_getRenderStateIndex( const SceneRenderState *sceneState,
    if ( sceneState && sceneState->isReflectPass() )
       currState |= RenderPassData::STATE_REFLECT;
 
-   if ( sgData.binType != SceneData::PrePassBin &&
+   if ( sgData.binType != SceneData::DeferredBin &&
         mMaterial->isTranslucent() )
       currState |= RenderPassData::STATE_TRANSLUCENT;
 

Engine/source/materials/processedShaderMaterial.cpp

@@ -301,7 +301,7 @@ void ProcessedShaderMaterial::_determineFeatures(  U32 stageNum,
 
    if ( mMaterial->isTranslucent() )
    {
-      // Note: This is for decal blending into the prepass
+      // Note: This is for decal blending into the deferred
       // for AL... it probably needs to be made clearer.
       if (  mMaterial->mTranslucentBlendOp == Material::LerpAlpha &&
             mMaterial->mTranslucentZWrite )
@@ -318,11 +318,11 @@ void ProcessedShaderMaterial::_determineFeatures(  U32 stageNum,
    if ( dStrcmp( LIGHTMGR->getId(), "BLM" ) == 0 )
       fd.features.addFeature( MFT_ForwardShading );
 
-   // Disabling the InterlacedPrePass feature for now. It is not ready for prime-time
+   // Disabling the InterlacedDeferred feature for now. It is not ready for prime-time
    // and it should not be triggered off of the DoubleSided parameter. [2/5/2010 Pat]
    /*if ( mMaterial->isDoubleSided() )
    {
-      fd.features.addFeature( MFT_InterlacedPrePass );
+      fd.features.addFeature( MFT_InterlacedDeferred );
    }*/
 
    // Allow instancing if it was requested and the card supports

Engine/source/materials/sceneData.h

@@ -49,9 +49,9 @@ struct SceneData
       /// @see RenderGlowMgr
       GlowBin,
 
-      /// The prepass render bin.
-      /// @RenderPrePassMgr
-      PrePassBin,
+      /// The deferred render bin.
+      /// @RenderDeferredMgr
+      DeferredBin,
    };
 
    /// This defines when we're rendering a special bin