Merge branch 'master' into 1.1
# Conflicts: # Source/Engine/Content/JsonAsset.h # Source/Engine/Core/Config/Settings.h
This commit is contained in:
@@ -42,6 +42,8 @@ Actor::Actor(const SpawnParams& params)
|
||||
, _staticFlags(StaticFlags::FullyStatic)
|
||||
, _localTransform(Transform::Identity)
|
||||
, _transform(Transform::Identity)
|
||||
, _sphere(BoundingSphere::Empty)
|
||||
, _box(BoundingBox::Empty)
|
||||
, HideFlags(HideFlags::None)
|
||||
{
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user