mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-02-26 10:03:48 +00:00
Merge branch 'development' of https://github.com/TorqueGameEngines/Torque3D into aiSubsystem
# Conflicts: # Engine/source/T3D/player.cpp
This commit is contained in:
commit
618ddbc9ba
60 changed files with 1751 additions and 38 deletions
|
|
@ -1923,7 +1923,7 @@ bool Player::onNewDataBlock( GameBaseData *dptr, bool reload )
|
|||
onScaleChanged();
|
||||
resetWorldBox();
|
||||
|
||||
scriptOnNewDataBlock();
|
||||
scriptOnNewDataBlock(reload);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue