From dc25f17a69b5c0f7e717e12ee923d1e131ff30da Mon Sep 17 00:00:00 2001 From: DavidWyand-GG Date: Thu, 8 Nov 2012 14:59:22 -0500 Subject: [PATCH] Fix for Issue #122 for Material Sounds --- .../game/tools/materialEditor/scripts/materialEditor.ed.cs | 2 +- .../game/tools/materialEditor/scripts/materialEditor.ed.cs | 2 +- .../game/tools/materialEditor/scripts/materialEditor.ed.cs | 2 +- .../Full/game/tools/materialEditor/scripts/materialEditor.ed.cs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Templates/Empty PhysX/game/tools/materialEditor/scripts/materialEditor.ed.cs b/Templates/Empty PhysX/game/tools/materialEditor/scripts/materialEditor.ed.cs index 9297eec94..f4465c281 100644 --- a/Templates/Empty PhysX/game/tools/materialEditor/scripts/materialEditor.ed.cs +++ b/Templates/Empty PhysX/game/tools/materialEditor/scripts/materialEditor.ed.cs @@ -814,7 +814,7 @@ function MaterialEditorGui::guiSync( %this, %material ) MaterialEditorPropertiesWindow-->showFootprintsCheckbox.setValue((%material).showFootprints); MaterialEditorPropertiesWindow-->showDustCheckbox.setValue((%material).showDust); MaterialEditorGui.updateSoundPopup("Footstep", (%material).footstepSoundId, (%material).customFootstepSound); - MaterialEditorGui.updateSoundPopup("Impact", (%material).footstepSoundId, (%material).customFootstepSound); + MaterialEditorGui.updateSoundPopup("Impact", (%material).impactSoundId, (%material).customImpactSound); //layer specific controls are located here %layer = MaterialEditorGui.currentLayer; diff --git a/Templates/Empty/game/tools/materialEditor/scripts/materialEditor.ed.cs b/Templates/Empty/game/tools/materialEditor/scripts/materialEditor.ed.cs index 9297eec94..f4465c281 100644 --- a/Templates/Empty/game/tools/materialEditor/scripts/materialEditor.ed.cs +++ b/Templates/Empty/game/tools/materialEditor/scripts/materialEditor.ed.cs @@ -814,7 +814,7 @@ function MaterialEditorGui::guiSync( %this, %material ) MaterialEditorPropertiesWindow-->showFootprintsCheckbox.setValue((%material).showFootprints); MaterialEditorPropertiesWindow-->showDustCheckbox.setValue((%material).showDust); MaterialEditorGui.updateSoundPopup("Footstep", (%material).footstepSoundId, (%material).customFootstepSound); - MaterialEditorGui.updateSoundPopup("Impact", (%material).footstepSoundId, (%material).customFootstepSound); + MaterialEditorGui.updateSoundPopup("Impact", (%material).impactSoundId, (%material).customImpactSound); //layer specific controls are located here %layer = MaterialEditorGui.currentLayer; diff --git a/Templates/Full PhysX/game/tools/materialEditor/scripts/materialEditor.ed.cs b/Templates/Full PhysX/game/tools/materialEditor/scripts/materialEditor.ed.cs index 9297eec94..f4465c281 100644 --- a/Templates/Full PhysX/game/tools/materialEditor/scripts/materialEditor.ed.cs +++ b/Templates/Full PhysX/game/tools/materialEditor/scripts/materialEditor.ed.cs @@ -814,7 +814,7 @@ function MaterialEditorGui::guiSync( %this, %material ) MaterialEditorPropertiesWindow-->showFootprintsCheckbox.setValue((%material).showFootprints); MaterialEditorPropertiesWindow-->showDustCheckbox.setValue((%material).showDust); MaterialEditorGui.updateSoundPopup("Footstep", (%material).footstepSoundId, (%material).customFootstepSound); - MaterialEditorGui.updateSoundPopup("Impact", (%material).footstepSoundId, (%material).customFootstepSound); + MaterialEditorGui.updateSoundPopup("Impact", (%material).impactSoundId, (%material).customImpactSound); //layer specific controls are located here %layer = MaterialEditorGui.currentLayer; diff --git a/Templates/Full/game/tools/materialEditor/scripts/materialEditor.ed.cs b/Templates/Full/game/tools/materialEditor/scripts/materialEditor.ed.cs index 9297eec94..f4465c281 100644 --- a/Templates/Full/game/tools/materialEditor/scripts/materialEditor.ed.cs +++ b/Templates/Full/game/tools/materialEditor/scripts/materialEditor.ed.cs @@ -814,7 +814,7 @@ function MaterialEditorGui::guiSync( %this, %material ) MaterialEditorPropertiesWindow-->showFootprintsCheckbox.setValue((%material).showFootprints); MaterialEditorPropertiesWindow-->showDustCheckbox.setValue((%material).showDust); MaterialEditorGui.updateSoundPopup("Footstep", (%material).footstepSoundId, (%material).customFootstepSound); - MaterialEditorGui.updateSoundPopup("Impact", (%material).footstepSoundId, (%material).customFootstepSound); + MaterialEditorGui.updateSoundPopup("Impact", (%material).impactSoundId, (%material).customImpactSound); //layer specific controls are located here %layer = MaterialEditorGui.currentLayer;