mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-02-21 23:53:51 +00:00
Merge pull request #1368 from Azaezel/alpha41/sourceGroupGrok
fill in asset based sound group if not specified by instanced emitter
This commit is contained in:
commit
5feef0ec5c
2 changed files with 5 additions and 0 deletions
|
|
@ -840,6 +840,9 @@ void SFXEmitter::_update()
|
|||
|
||||
if (mDirty.test(SourceGroup) && mInstanceDescription->mSourceGroup)
|
||||
mInstanceDescription->mSourceGroup->addObject(mSource);
|
||||
else if (getSoundDescription() && getSoundDescription()->mSourceGroup)
|
||||
getSoundDescription()->mSourceGroup->addObject(mSource);
|
||||
|
||||
// Skip these 3d only settings.
|
||||
if(mInstanceDescription->mIs3D )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -184,6 +184,8 @@ void GuiAudioCtrl::_update()
|
|||
mSoundPlaying->setFadeTimes(mFadeInTime, mFadeOutTime);
|
||||
|
||||
}
|
||||
else
|
||||
getSoundDescription()->mSourceGroup->addObject(mSoundPlaying);
|
||||
|
||||
mSoundPlaying->play();
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue