Restore support for BlendTexture property

Closes: #602
pull/688/head
Hleb Valoshka 2020-02-11 21:56:48 +03:00
parent 845c1a5454
commit 3599f14e12
2 changed files with 1 additions and 5 deletions

View File

@ -3257,9 +3257,7 @@ static void renderSphereUnlit(const RenderInfo& ri,
prog->use();
prog->textureOffset = 0.0f;
// TODO: introduce a new ShaderProperties light model, so those
// assignments are not required
prog->ambientColor = Color::White.toVector3();
prog->ambientColor = ri.color.toVector3();
prog->opacity = 1.0f;
#ifdef USE_HDR
prog->nightLightScale = ri.nightLightScale;

View File

@ -285,8 +285,6 @@ void renderEllipsoid_GLSL(const RenderInfo& ri,
if (shadprop.hasEclipseShadows() != 0)
prog->setEclipseShadowParameters(ls, semiAxes, planetOrientation);
glColor(ri.color);
unsigned int attributes = LODSphereMesh::Normals;
if (ri.bumpTex != nullptr)
attributes |= LODSphereMesh::Tangents;