Browse Source

Merge pull request #123 from DavidWyand-GG/issue122-MaterialSounds

Fix for Issue #122 for Material Sounds
David Wyand 13 years ago
parent
commit
aa3a6d52ff

+ 1 - 1
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;

+ 1 - 1
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;

+ 1 - 1
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;

+ 1 - 1
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;