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

Merge branch 'stabilization/2106' of https://github.com/o3de/o3de into carlitosan/thecleansing

Browse Source
This commit is contained in:
chcurran
2021-07-06 07:27:29 -07:00
parent 88c328c6e2 827805ed83
commit fa7accf2dc
630 changed files with 8410 additions and 14529 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingDataAggregator.cpp
+4 -4
View File
@@ -1,6 +1,6 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
*
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
*/
@@ -289,7 +289,7 @@ namespace ScriptCanvasEditor
void LoggingDataAggregator::OnRegistrationDisabled(const AZ::NamedEntityId&, const ScriptCanvas::GraphIdentifier&)
{
}
void LoggingDataAggregator::ResetLog()
@@ -324,7 +324,7 @@ namespace ScriptCanvasEditor
m_hasAnchor = false;
m_anchorTimeStamp = ScriptCanvas::Timestamp(0);
}
void LoggingDataAggregator::RegisterScriptCanvas(const AZ::NamedEntityId& entityId, const ScriptCanvas::GraphIdentifier& graphIdentifier)
{
bool foundMatch = false;
@@ -335,7 +335,7 @@ namespace ScriptCanvasEditor
if (mapIter->second == graphIdentifier)
{
foundMatch = true;
AZ_Error("ScriptCanvas", false, "Received a duplicated registration callback.");
AZ_Warning("ScriptCanvas", false, "Received a duplicated registration callback.");
}
}
Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindow.cpp
+1 -1
View File
@@ -523,7 +523,7 @@ namespace ScriptCanvasEditor
// Creation Actions
{
m_createScriptCanvas = new QToolButton();
m_createScriptCanvas->setIcon(QIcon(ScriptCanvas::AssetDescription::GetIconPath<ScriptCanvasAsset>()));
m_createScriptCanvas->setIcon(QIcon(":/ScriptCanvasEditorResources/Resources/create_graph.png"));
m_createScriptCanvas->setToolTip("Creates a new Script Canvas Graph");
QObject::connect(m_createScriptCanvas, &QToolButton::clicked, this, &MainWindow::OnFileNew);
Gems/ScriptCanvas/Code/Editor/View/Windows/Resources/create_graph.png
+3
View File
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f920ea2cd388c6db572344e33ccbf96f65ee6d391ae1880cfe16eff58d0da381
size 4016
Gems/ScriptCanvas/Code/Editor/View/Windows/ScriptCanvasEditorResources.qrc
+1
View File
@@ -12,6 +12,7 @@
<file>Resources/capture_offline.png</file>
<file>Resources/create_function_input.png</file>
<file>Resources/create_function_output.png</file>
<file>Resources/create_graph.png</file>
<file>Resources/CollapseAll_Icon.png</file>
<file>Resources/edit_icon.png</file>
<file>Resources/error_icon.png</file>