Merge remote-tracking branch 'origin/master' into 1.9
# Conflicts: # Source/Engine/Content/Storage/FlaxStorage.cpp # Source/Engine/Renderer/GBufferPass.cpp
This commit is contained in:
@@ -609,7 +609,10 @@ void Actor::SetIsActive(bool value)
|
||||
|
||||
void Actor::SetStaticFlags(StaticFlags value)
|
||||
{
|
||||
if (_staticFlags == value)
|
||||
return;
|
||||
_staticFlags = value;
|
||||
OnStaticFlagsChanged();
|
||||
}
|
||||
|
||||
void Actor::SetTransform(const Transform& value)
|
||||
@@ -1229,6 +1232,14 @@ void Actor::OnOrderInParentChanged()
|
||||
Level::callActorEvent(Level::ActorEventType::OnActorOrderInParentChanged, this, nullptr);
|
||||
}
|
||||
|
||||
void Actor::OnStaticFlagsChanged()
|
||||
{
|
||||
}
|
||||
|
||||
void Actor::OnLayerChanged()
|
||||
{
|
||||
}
|
||||
|
||||
BoundingBox Actor::GetBoxWithChildren() const
|
||||
{
|
||||
BoundingBox result = GetBox();
|
||||
|
||||
Reference in New Issue
Block a user