engine: sync editor rendering and ui changes
This commit is contained in:
@@ -324,7 +324,6 @@ void Material::Release() {
|
||||
m_renderQueue = static_cast<Core::int32>(MaterialRenderQueue::Geometry);
|
||||
m_renderState = MaterialRenderState();
|
||||
m_hasRenderStateOverride = false;
|
||||
m_legacyShaderPassHint.Clear();
|
||||
m_tags.Clear();
|
||||
m_keywordSet.enabledKeywords.Clear();
|
||||
m_properties.Clear();
|
||||
@@ -363,24 +362,6 @@ void Material::SetRenderStateOverrideEnabled(bool enabled) {
|
||||
MarkChanged(false);
|
||||
}
|
||||
|
||||
void Material::SetLegacyShaderPassHint(const Containers::String& shaderPass) {
|
||||
m_legacyShaderPassHint = shaderPass;
|
||||
MarkChanged(false);
|
||||
}
|
||||
|
||||
void Material::ClearLegacyShaderPassHint() {
|
||||
if (m_legacyShaderPassHint.Empty()) {
|
||||
return;
|
||||
}
|
||||
|
||||
m_legacyShaderPassHint.Clear();
|
||||
MarkChanged(false);
|
||||
}
|
||||
|
||||
void Material::SetShaderPass(const Containers::String& shaderPass) {
|
||||
SetLegacyShaderPassHint(shaderPass);
|
||||
}
|
||||
|
||||
void Material::SetTag(const Containers::String& name, const Containers::String& value) {
|
||||
for (MaterialTagEntry& tag : m_tags) {
|
||||
if (tag.name == name) {
|
||||
@@ -1120,7 +1101,6 @@ void Material::UpdateMemorySize() {
|
||||
m_memorySize = m_constantBufferData.Size() +
|
||||
m_constantLayout.Size() * sizeof(MaterialConstantFieldDesc) +
|
||||
sizeof(MaterialRenderState) +
|
||||
m_legacyShaderPassHint.Length() +
|
||||
m_tags.Size() * sizeof(MaterialTagEntry) +
|
||||
m_keywordSet.enabledKeywords.Size() * sizeof(Containers::String) +
|
||||
m_textureBindings.Size() * sizeof(MaterialTextureBinding) +
|
||||
|
||||
Reference in New Issue
Block a user