mirrors/linux-wallpaperengine
1
0
Fork 0
mirror of https://github.com/Almamu/linux-wallpaperengine.git synced 2025-07-16 14:22:24 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

~ Material's passes do not have textures everytime

Browse Source 
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
This commit is contained in:
Alexis Maiquez 2019-08-14 17:07:07 +02:00
parent 400a2c0c84
commit b85b12d4a1
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
wallpaperengine/core/objects/images/materials/passes.cpp
View File

@ -57,14 +57,12 @@ passes* passes::fromJSON (json data)
throw std::runtime_error ("Material pass must have shader specified");
}
if (textures_it == data.end ())
if (textures_it != data.end ())
{
throw std::runtime_error ("Material pass must have textures specified");
}
if ((*textures_it).is_array () == false)
{
throw std::runtime_error ("Textures for material must be a list");
if ((*textures_it).is_array () == false)
{
throw std::runtime_error ("Textures for material must be a list");
}
}
passes* pass = new passes (
@ -75,18 +73,21 @@ passes* passes::fromJSON (json data)
*shader_it
);
json::const_iterator cur = (*textures_it).begin ();
json::const_iterator end = (*textures_it).end ();
for (;cur != end; cur ++)
if (textures_it != data.end ())
{
if ((*cur).is_null () == true)
json::const_iterator cur = (*textures_it).begin ();
json::const_iterator end = (*textures_it).end ();
for (;cur != end; cur ++)
{
pass->insertTexture ("");
}
else
{
pass->insertTexture (*cur);
if ((*cur).is_null () == true)
{
pass->insertTexture ("");
}
else
{
pass->insertTexture (*cur);
}
}
}