birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'development' into cmake/SPEC-2513_w4244

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/CryEditDoc.cpp
#	Code/Framework/AzToolsFramework/AzToolsFramework/Input/QtEventToAzInputManager.cpp
#	Gems/Atom/Feature/Common/Code/Source/PostProcessing/BlendColorGradingLutsPass.cpp
#	Gems/PhysXDebug/Code/Source/SystemComponent.cpp
This commit is contained in:
Esteban Papp
2021-08-19 08:53:41 -07:00
parent 1e136a02b0 fdc464c6fd
commit f8e99cd7dd
370 changed files with 3276 additions and 4248 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Math/OperatorMul.cpp
+1 -1
View File
@@ -58,7 +58,7 @@ namespace ScriptCanvas
void OperatorMul::Operator(Data::eType type, const ArithmeticOperands& operands, Datum& result)
{
AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::ScriptCanvas);
AZ_PROFILE_FUNCTION(ScriptCanvas);
switch (type)
{
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/DelayNodeable.cpp
+1 -1
View File
@@ -49,7 +49,7 @@ namespace ScriptCanvas
void DelayNodeable::OnTick(float deltaTime, [[maybe_unused]] AZ::ScriptTimePoint time)
{
AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::ScriptCanvas);
AZ_PROFILE_FUNCTION(ScriptCanvas);
SCRIPT_CANVAS_PERFORMANCE_SCOPE_LATENT(GetScriptCanvasId(), GetAssetId());
m_currentTime -= static_cast<float>(deltaTime);
if (m_currentTime <= 0.f)
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/DurationNodeable.cpp
+1 -1
View File
@@ -28,7 +28,7 @@ namespace ScriptCanvas
void DurationNodeable::OnTick(float deltaTime, [[maybe_unused]] AZ::ScriptTimePoint time)
{
AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::ScriptCanvas);
AZ_PROFILE_FUNCTION(ScriptCanvas);
SCRIPT_CANVAS_PERFORMANCE_SCOPE_LATENT(GetScriptCanvasId(), GetAssetId());
if (m_elapsedTime <= m_duration)
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Time/TimerNodeable.cpp
+1 -1
View File
@@ -16,7 +16,7 @@ namespace ScriptCanvas
{
void TimerNodeable::OnTick(float /*deltaTime*/, AZ::ScriptTimePoint time)
{
AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::ScriptCanvas);
AZ_PROFILE_FUNCTION(ScriptCanvas);
SCRIPT_CANVAS_PERFORMANCE_SCOPE_LATENT(GetScriptCanvasId(), GetAssetId());
double milliseconds = time.GetMilliseconds() - m_start.GetMilliseconds();
double seconds = time.GetSeconds() - m_start.GetSeconds();