Skip to content

Editor: Custom functions in the material editor ignores default values #588 #589

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eprikazchikov merged 1 commit into from
Nov 3, 2023
Merged

Editor: Custom functions in the material editor ignores default values #588 #589

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions modules/editor/shadertools/converter/functions/customfunction.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ class CustomFunction : public ShaderNode {
}

QString defaultValue(const string &key, uint32_t &type) const override {
QVariant value = property(key.c_str());
QVariant value = property(qPrintable(m_funcName + "/" + key.c_str()));

if(value.type() == QVariant::String) {
return value.toString();
Expand Down Expand Up @@ -189,8 +189,7 @@ class CustomFunction : public ShaderNode {
bool event(QEvent *e) override {
if(e->type() == QEvent::DynamicPropertyChange && !signalsBlocked()) {
QDynamicPropertyChangeEvent *ev = static_cast<QDynamicPropertyChangeEvent *>(e);
QString name = ev->propertyName().split('/').back();
QVariant value = property(qPrintable(name));
QVariant value = property(qPrintable(ev->propertyName()));
if(value.isValid()) {
emit updated();
}
Expand Down