TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-05 21:40:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Remove name-clashes in AFX code-base

Browse source
This commit is contained in:
Lukas Aldershaab 2020-10-04 03:18:54 +02:00
parent f4c8e2683e
commit 158bf5528c
5 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/afx/afxEffectron.cpp
View file

@ -216,13 +216,13 @@ DefineEngineMethod(afxEffectronData, reset, void, (),,
object->reloadReset();
}
DefineEngineMethod(afxEffectronData, addEffect, void, (afxEffectBaseData* effect),,
DefineEngineMethod(afxEffectronData, pushEffect, void, (afxEffectBaseData* effect),,
"Adds an effect (wrapper or group) to an effectron's phase.\n\n"
"@ingroup AFX")
{
if (!effect)
{
Con::errorf("afxEffectronData::addEffect() -- missing afxEffectWrapperData.");
Con::errorf("afxEffectronData::pushEffect() -- missing afxEffectWrapperData.");
return;
}