diff --git a/src/Layers/xrRender/blenders/Blender_LaEmB.cpp b/src/Layers/xrRender/blenders/Blender_LaEmB.cpp index 8ef4772b064..f26736c1b36 100644 --- a/src/Layers/xrRender/blenders/Blender_LaEmB.cpp +++ b/src/Layers/xrRender/blenders/Blender_LaEmB.cpp @@ -136,14 +136,10 @@ void CBlender_LaEmB::Compile(CBlender_Compile& C) return; } - if (2 == C.iElement) + switch (C.iElement) { - if (bConstant) - compile_Lc(C); - else - compile_L(C); - } - else + case SE_R1_NORMAL_HQ: + case SE_R1_NORMAL_LQ: { switch (HW.Caps.raster.dwStages) { @@ -161,7 +157,17 @@ void CBlender_LaEmB::Compile(CBlender_Compile& C) compile_3(C); break; } // switch (HW.Caps.raster.dwStages) + break; + } + case SE_R1_LMODELS: + { + if (bConstant) + compile_Lc(C); + else + compile_L(C); + break; } + } // switch (C.iElement) } // void CBlender_LaEmB::compile_2(CBlender_Compile& C) diff --git a/src/Layers/xrRender/blenders/Blender_Lm(EbB).cpp b/src/Layers/xrRender/blenders/Blender_Lm(EbB).cpp index 74b293dd98e..9fc10cc44b6 100644 --- a/src/Layers/xrRender/blenders/Blender_Lm(EbB).cpp +++ b/src/Layers/xrRender/blenders/Blender_Lm(EbB).cpp @@ -60,11 +60,10 @@ void CBlender_LmEbB::CompileFFP(CBlender_Compile& C) const compile_ED(C); else { - if (2 == C.iElement) + switch (C.iElement) { - compile_L(C); - } - else + case SE_R1_NORMAL_HQ: + case SE_R1_NORMAL_LQ: { switch (HW.Caps.raster.dwStages) { @@ -75,8 +74,15 @@ void CBlender_LmEbB::CompileFFP(CBlender_Compile& C) const default: compile_3(C); break; - } - } // switch (HW.Caps.raster.dwStages) + } // switch (HW.Caps.raster.dwStages) + break; + } + case SE_R1_LMODELS: + { + compile_L(C); + break; + } + } // switch (C.iElement) } } diff --git a/src/Layers/xrRender/blenders/Blender_Model_EbB.cpp b/src/Layers/xrRender/blenders/Blender_Model_EbB.cpp index c23b8248825..a28fc93d78e 100644 --- a/src/Layers/xrRender/blenders/Blender_Model_EbB.cpp +++ b/src/Layers/xrRender/blenders/Blender_Model_EbB.cpp @@ -119,9 +119,6 @@ void CBlender_Model_EbB::CompileFFP(CBlender_Compile& C) const C.StageEnd(); break; } - - default: - break; } // switch (C.iElement) } C.PassEnd(); diff --git a/src/Layers/xrRender/blenders/Blender_Vertex.cpp b/src/Layers/xrRender/blenders/Blender_Vertex.cpp index 236326bd6c2..701a0c151c5 100644 --- a/src/Layers/xrRender/blenders/Blender_Vertex.cpp +++ b/src/Layers/xrRender/blenders/Blender_Vertex.cpp @@ -111,7 +111,6 @@ void CBlender_Vertex::CompileFFP(CBlender_Compile& C) const C.PassEnd(); break; } - case SE_R1_LMODELS: { // Lighting only @@ -133,9 +132,6 @@ void CBlender_Vertex::CompileFFP(CBlender_Compile& C) const C.PassEnd(); break; } - - default: - break; } // switch (C.iElement) } } diff --git a/src/Layers/xrRender/blenders/Blender_Vertex_aref.cpp b/src/Layers/xrRender/blenders/Blender_Vertex_aref.cpp index 3a0b8826054..7d454462fde 100644 --- a/src/Layers/xrRender/blenders/Blender_Vertex_aref.cpp +++ b/src/Layers/xrRender/blenders/Blender_Vertex_aref.cpp @@ -110,7 +110,6 @@ void CBlender_Vertex_aref::CompileFFP(CBlender_Compile& C) const C.PassEnd(); break; } - case SE_R1_LMODELS: { // Lighting only diff --git a/src/Layers/xrRender/blenders/Blender_default_aref.cpp b/src/Layers/xrRender/blenders/Blender_default_aref.cpp index 7df83ad1480..f0ba321bc2a 100644 --- a/src/Layers/xrRender/blenders/Blender_default_aref.cpp +++ b/src/Layers/xrRender/blenders/Blender_default_aref.cpp @@ -142,9 +142,6 @@ void CBlender_default_aref::CompileFFP(CBlender_Compile& C) const C.PassEnd(); break; } - - default: - break; } // switch (C.iElement) } } diff --git a/src/Layers/xrRender/blenders/Blender_tree.cpp b/src/Layers/xrRender/blenders/Blender_tree.cpp index d3a0c07d534..3dc0e15b147 100644 --- a/src/Layers/xrRender/blenders/Blender_tree.cpp +++ b/src/Layers/xrRender/blenders/Blender_tree.cpp @@ -91,7 +91,6 @@ void CBlender_Tree::CompileFFP(CBlender_Compile& C) const C.StageEnd(); break; } - case SE_R1_LMODELS: { // Lighting only @@ -105,9 +104,6 @@ void CBlender_Tree::CompileFFP(CBlender_Compile& C) const C.StageEnd(); break; } - - default: - break; } // switch (C.iElement) }