From 063db3d38299de9575e65d831a87ea7bb676096d Mon Sep 17 00:00:00 2001 From: milek7 Date: Mon, 7 Mar 2022 20:52:48 +0100 Subject: [PATCH] do not overwrite submodel opacity with material, which is contrary to all logic and reason, but it seems some horrible hacks expect not to overwrite it --- Model3d.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Model3d.cpp b/Model3d.cpp index 1dbeef03..73571147 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -421,7 +421,7 @@ std::pair TSubModel::Load( cParser &parser, bool dynamic ) if (m_material > 0) { const opengl_material &mat = GfxRenderer->Material(m_material); - +/* // if material does have opacity set, replace submodel opacity with it if (mat.opacity) { @@ -431,7 +431,7 @@ std::pair TSubModel::Load( cParser &parser, bool dynamic ) else iFlags |= 0x10; // opaque } - +*/ // and same thing with selfillum if (mat.selfillum) fLight = *mat.selfillum; @@ -2055,7 +2055,7 @@ void TSubModel::BinInit(TSubModel *s, float4x4 *m, std::vector *t, if ( m_material != null_handle ) { opengl_material const &mat = GfxRenderer->Material(m_material); - +/* // if material does have opacity set, replace submodel opacity with it if (mat.opacity) { @@ -2065,7 +2065,7 @@ void TSubModel::BinInit(TSubModel *s, float4x4 *m, std::vector *t, else iFlags |= 0x10; // opaque } - +*/ // replace submodel selfillum with material one if( mat.selfillum ) { fLight = mat.selfillum.value();