mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-02-24 00:53:47 +00:00
Resolves merging-order conflicts for the vehicle physics PR, as well as correcting cmake not blacklisting the componentGroup files if TORQUE_EXPERIMENTAL_EC was flipped off.
This commit is contained in:
commit
3a73344abb
36 changed files with 357 additions and 46 deletions
|
|
@ -144,6 +144,7 @@ SceneObject::SceneObject()
|
|||
mIsScopeAlways = false;
|
||||
|
||||
mAccuTex = NULL;
|
||||
mPathfindingIgnore = false;
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -371,6 +371,7 @@ class SceneObject : public NetObject, private SceneContainer::Link, public Proce
|
|||
|
||||
SceneObject();
|
||||
virtual ~SceneObject();
|
||||
bool mPathfindingIgnore;
|
||||
|
||||
/// Triggered when a SceneObject onAdd is called.
|
||||
static Signal< void( SceneObject* ) > smSceneObjectAdd;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue