Some fixes
This commit is contained in:
parent
50ca5bc5c9
commit
91f2738ec9
@ -167,6 +167,7 @@ namespace materials
|
|||||||
image->textures.map = nullptr;
|
image->textures.map = nullptr;
|
||||||
image->textures.shaderView = nullptr;
|
image->textures.shaderView = nullptr;
|
||||||
image->textures.shaderViewAlternate = nullptr;
|
image->textures.shaderViewAlternate = nullptr;
|
||||||
|
texture_table->u.image = image;
|
||||||
|
|
||||||
material->textureTable = texture_table;
|
material->textureTable = texture_table;
|
||||||
|
|
||||||
|
@ -134,9 +134,9 @@ namespace utils::string
|
|||||||
std::string strip(const std::string& string)
|
std::string strip(const std::string& string)
|
||||||
{
|
{
|
||||||
std::string new_string;
|
std::string new_string;
|
||||||
new_string.resize(string.size(), 0);
|
new_string.resize(string.size() + 1, 0);
|
||||||
strip(string.data(), new_string.data(), static_cast<int>(new_string.size()));
|
strip(string.data(), new_string.data(), static_cast<int>(new_string.size()));
|
||||||
return new_string;
|
return new_string.data();
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string convert(const std::wstring& wstr)
|
std::string convert(const std::wstring& wstr)
|
||||||
|
Loading…
Reference in New Issue
Block a user