Changeset 1354 for OGRE

Timestamp:

09/13/06 11:23:03 (18 years ago)

Author:

szirmay

Message:

 

File:

• OGRE/trunk/ogre_changes/Ogre1.2/RenderSystems/Direct3D9/src/OgreD3D9RenderSystem.cpp (modified) (3 diffs)

OGRE/trunk/ogre_changes/Ogre1.2/RenderSystems/Direct3D9/src/OgreD3D9RenderSystem.cpp

@@ -1925 +1925 @@
                 HRESULT hr;
                 if( sourceFactor == SBF_ONE && destFactor == SBF_ZERO &&
-                        sourceFactorAlpha == SBF_ONE && destFactorAlpha == SBF_ZERO)
+                        sourceFactorAlpha == SBF_ONE && destFactorAlpha == SBF_ZERO &&
+                        blendOp == SBOP_ADD && blendOpAlpha == SBOP_ADD)
                 {
                         if (FAILED(hr = __SetRenderState(D3DRS_ALPHABLENDENABLE, FALSE)))
@@ -1940 +1941 @@
                                         OGRE_EXCEPT( hr, "Failed to set alpha blending option", "D3D9RenderSystem::_setSceneBlending" );
                                 
-                                if (FAILED(hr = __SetRenderState(D3DRS_BLENDOPALPHA, D3D9Mappings::get(blendOp))))
+                                if (FAILED(hr = __SetRenderState(D3DRS_BLENDOPALPHA, D3D9Mappings::get(blendOpAlpha))))
                                         OGRE_EXCEPT( hr, "Failed to set alpha blending option", "D3D9RenderSystem::_setSceneBlending" );
 
-                                if( FAILED( hr = __SetRenderState( D3DRS_SRCBLENDALPHA, D3D9Mappings::get(sourceFactor) ) ) )
+                                if( FAILED( hr = __SetRenderState( D3DRS_SRCBLENDALPHA, D3D9Mappings::get(sourceFactorAlpha) ) ) )
                                         OGRE_EXCEPT( hr, "Failed to set source blend", "D3D9RenderSystem::_setSceneBlending" );
-                                if( FAILED( hr = __SetRenderState( D3DRS_DESTBLENDALPHA, D3D9Mappings::get(destFactor) ) ) )
+                                if( FAILED( hr = __SetRenderState( D3DRS_DESTBLENDALPHA, D3D9Mappings::get(destFactorAlpha) ) ) )
                                         OGRE_EXCEPT( hr, "Failed to set destination blend", "D3D9RenderSystem::_setSceneBlending" );
                 
@@ -1955 +1956 @@
                         }
                         
-                        if (FAILED(hr = __SetRenderState(D3DRS_BLENDOP, D3D9Mappings::get(blendOpAlpha))))
+                        if (FAILED(hr = __SetRenderState(D3DRS_BLENDOP, D3D9Mappings::get(blendOp))))
                                         OGRE_EXCEPT( hr, "Failed to set alpha blending option", "D3D9RenderSystem::_setSceneBlending" );
                         if( FAILED( hr = __SetRenderState( D3DRS_SRCBLEND, D3D9Mappings::get(sourceFactor) ) ) )