diff options
| author | Andy Nichols <andy.nichols@qt.io> | 2017-11-20 10:11:24 +0100 |
|---|---|---|
| committer | Andy Nichols <andy.nichols@qt.io> | 2017-11-20 10:11:45 +0100 |
| commit | e611d7f28c2bf5eb7963d8d1e4779293b29b7123 (patch) | |
| tree | 37de5fb61bcf1f3e4fe5ef87c91d0dbd0a275d69 /src/render/materialsystem | |
| parent | ab2d05d06b37fe875d360f92fe67e103ae17d80b (diff) | |
| parent | 5e94e34c5b9567980929e677357467806aacaf1a (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Change-Id: Ia6496e1ea22f2393a28e37cdd9f6e34f7613db49
Diffstat (limited to 'src/render/materialsystem')
| -rw-r--r-- | src/render/materialsystem/parameter.cpp | 5 | ||||
| -rw-r--r-- | src/render/materialsystem/prototypes/default.json | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/render/materialsystem/parameter.cpp b/src/render/materialsystem/parameter.cpp index 6671e4943..f00df3c90 100644 --- a/src/render/materialsystem/parameter.cpp +++ b/src/render/materialsystem/parameter.cpp @@ -87,10 +87,13 @@ void Parameter::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) if (propertyChange->propertyName() == QByteArrayLiteral("name")) { m_name = propertyChange->value().toString(); m_nameId = StringToInt::lookupId(m_name); + markDirty(AbstractRenderer::MaterialDirty | AbstractRenderer::ParameterDirty); } else if (propertyChange->propertyName() == QByteArrayLiteral("value")) { m_uniformValue = UniformValue::fromVariant(propertyChange->value()); + markDirty(AbstractRenderer::ParameterDirty); + } else if (propertyChange->propertyName() == QByteArrayLiteral("enabled")) { + markDirty(AbstractRenderer::MaterialDirty | AbstractRenderer::ParameterDirty); } - markDirty(AbstractRenderer::AllDirty); } BackendNode::sceneChangeEvent(e); diff --git a/src/render/materialsystem/prototypes/default.json b/src/render/materialsystem/prototypes/default.json index 9f16b0f53..535f144d7 100644 --- a/src/render/materialsystem/prototypes/default.json +++ b/src/render/materialsystem/prototypes/default.json @@ -91,7 +91,7 @@ "major": 3, "minor": 0 }, - "substitution": "vec4 $color = texture2D($name, $coord);", + "substitution": "vec4 $color = texture($name, $coord);", "headerSnippets": [ "uniform sampler2D $name;" ] } ] |