Proc Prefabs: Remove feature toggle (#6348)
* Disable feature flag - redirect proc prefab check to IsPrefabSystemEnabled. Procedural Prefabs are now on by default when the prefab system is enabled. Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com> * Bump scene builder version to cause all procedural prefabs to rebuild Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com> * Switch to lambda for ebus call Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com> * Remove unused const Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
This commit is contained in:
+9
-5
@@ -9,12 +9,11 @@
|
||||
#include <AzCore/Serialization/SerializeContext.h>
|
||||
#include <AzCore/Serialization/Json/RegistrationContext.h>
|
||||
#include <AzCore/Settings/SettingsRegistry.h>
|
||||
#include <AzFramework/API/ApplicationAPI.h>
|
||||
#include <AzFramework/FileFunc/FileFunc.h>
|
||||
|
||||
namespace AZ::Prefab
|
||||
{
|
||||
static constexpr const char s_useProceduralPrefabsKey[] = "/O3DE/Preferences/Prefabs/UseProceduralPrefabs";
|
||||
|
||||
// ProceduralPrefabAsset
|
||||
|
||||
ProceduralPrefabAsset::ProceduralPrefabAsset(const AZ::Data::AssetId& assetId)
|
||||
@@ -58,9 +57,14 @@ namespace AZ::Prefab
|
||||
|
||||
bool ProceduralPrefabAsset::UseProceduralPrefabs()
|
||||
{
|
||||
bool useProceduralPrefabs = false;
|
||||
bool result = AZ::SettingsRegistry::Get()->GetObject(useProceduralPrefabs, s_useProceduralPrefabsKey);
|
||||
return result && useProceduralPrefabs;
|
||||
bool prefabsEnabled = false;
|
||||
AzFramework::ApplicationRequests::Bus::Broadcast(
|
||||
[&prefabsEnabled](AzFramework::ApplicationRequests::Bus::Events* ebus)
|
||||
{
|
||||
prefabsEnabled = ebus->IsPrefabSystemEnabled();
|
||||
});
|
||||
|
||||
return prefabsEnabled;
|
||||
}
|
||||
|
||||
// PrefabDomData
|
||||
|
||||
Reference in New Issue
Block a user