eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-18 04:19:19 +02:00
Code Issues 121 Wiki Activity

Merge remote-tracking branch 'tmj/master' into sim

Browse Source
This commit is contained in:
milek7
2020-10-21 02:52:49 +02:00
parent 0a8359068f dee0bd13f4
commit 494f4fbef2
10 changed files with 39 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
material.cpp
View File

@@ -426,9 +426,9 @@ opengl_material::deserialize_mapping( cParser &Input, int const Priority, bool c
float opengl_material::get_or_guess_opacity() const {
if (!std::isnan(opacity))
return opacity;
if( opacity ) {
return opacity.value();
}
if (textures[0] != null_handle)
{
auto const &tex = GfxRenderer->Texture(textures[0]);