etc/obs-StreamFX
0
0
Fork 0
mirror of https://github.com/Xaymar/obs-StreamFX synced 2024-11-11 06:15:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

gfx/shader/param-texture: Fix detection of enumerations and paths

Browse source
This commit is contained in:
Michael Fabian 'Xaymar' Dirks 2021-11-27 07:59:24 +01:00
parent 5673138ff8
commit ab84537a6e
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
source/gfx/shader/gfx-shader-param-texture.cpp
View file

@ -108,7 +108,8 @@ streamfx::gfx::shader::texture_parameter::texture_parameter(streamfx::gfx::shade
// Value must be given, name is optional. // Value must be given, name is optional.
if (auto eanno = get_parameter().get_annotation(key_value); if (auto eanno = get_parameter().get_annotation(key_value);
eanno && (get_type_from_effect_type(eanno.get_type()) == get_type())) { eanno
&& (get_type_from_effect_type(eanno.get_type()) == streamfx::gfx::shader::parameter_type::String)) {
texture_enum_data entry; texture_enum_data entry;
entry.data.file = std::filesystem::path(eanno.get_default_string()); entry.data.file = std::filesystem::path(eanno.get_default_string());
@ -210,7 +211,7 @@ void streamfx::gfx::shader::texture_parameter::properties(obs_properties_t* prop
std::filesystem::path make_absolute_to(std::filesystem::path origin, std::filesystem::path destination) std::filesystem::path make_absolute_to(std::filesystem::path origin, std::filesystem::path destination)
{ {
auto destination_dir = std::filesystem::absolute(destination.remove_filename()); auto destination_dir = std::filesystem::absolute(destination.remove_filename());
return std::filesystem::absolute(origin / destination); return std::filesystem::absolute(destination / origin);
} }
void streamfx::gfx::shader::texture_parameter::update(obs_data_t* settings) void streamfx::gfx::shader::texture_parameter::update(obs_data_t* settings)