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

Merge branch 'stabilization/2106' into redcode/SPEC-7563

Browse Source
This commit is contained in:
Esteban Papp
2021-06-30 09:20:08 -07:00
parent d6caff7842 6392788212
commit 5fa495380c
55 changed files with 1182 additions and 972 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Editor/EditorDefs.h
-9
View File
@@ -7,15 +7,6 @@
#pragma once
////////////////////////////////////////////////////////////////////////////
//
// Crytek Engine Source File.
// Copyright (C), Crytek Studios
// -------------------------------------------------------------------------
// Created: 13/2/2003 by Timur.
// Description: Main header included by every file in Editor.
//
////////////////////////////////////////////////////////////////////////////
#ifndef CRYINCLUDE_EDITOR_EDITORDEFS_H
#define CRYINCLUDE_EDITOR_EDITORDEFS_H
Code/Editor/EditorViewportWidget.cpp
+2 -1
View File
@@ -462,7 +462,6 @@ void EditorViewportWidget::Update()
SetViewTM(m);
SetFOV(cameraState.m_fovOrZoom);
m_Camera.SetZRange(cameraState.m_nearClip, cameraState.m_farClip);
m_updateCameraPositionNextTick = false;
}
else if (!ed_useNewCameraSystem)
{
@@ -483,6 +482,8 @@ void EditorViewportWidget::Update()
);
m_renderViewport->GetViewportContext()->SetCameraProjectionMatrix(clipMatrix);
}
// Reset the camera update flag now that we're finished updating our viewport context
m_updateCameraPositionNextTick = false;
// Don't wait for changes to update the focused viewport.
if (CheckRespondToInput())
Code/Editor/NewLevelDialog.h
-14
View File
@@ -7,20 +7,6 @@
#pragma once
////////////////////////////////////////////////////////////////////////////
//
// Crytek Engine Source File.
// Copyright (C), Crytek Studios, 2002.
// -------------------------------------------------------------------------
// File name: newleveldialog.h
// Version: v1.00
// Created: 24/7/2002 by Timur.
// Compilers: Visual Studio.NET
// Description:
// -------------------------------------------------------------------------
// History:
//
////////////////////////////////////////////////////////////////////////////
#ifndef CRYINCLUDE_EDITOR_NEWLEVELDIALOG_H
#define CRYINCLUDE_EDITOR_NEWLEVELDIALOG_H
Code/Editor/NewTerrainDialog.h
-14
View File
@@ -5,20 +5,6 @@
*
*/
#pragma once
////////////////////////////////////////////////////////////////////////////
//
// Crytek Engine Source File.
// Copyright (C), Crytek Studios, 2002.
// -------------------------------------------------------------------------
// File name: newterraindialog.h
// Version: v1.00
// Created: 24/7/2002 by Timur.
// Compilers: Visual Studio.NET
// Description:
// -------------------------------------------------------------------------
// History:
//
////////////////////////////////////////////////////////////////////////////
#ifndef CRYINCLUDE_EDITOR_NEWTERRAINDIALOG_H
#define CRYINCLUDE_EDITOR_NEWTERRAINDIALOG_H
Code/Editor/Plugin.h
-9
View File
@@ -7,15 +7,6 @@
#pragma once
////////////////////////////////////////////////////////////////////////////
//
// Crytek Engine Source File.
// Copyright (C), Crytek Studios, 2001-2012
// -------------------------------------------------------------------------
// Created: 15/1/2003 by Timur.
// Description: Plugin architecture supporting classes
//
////////////////////////////////////////////////////////////////////////////
#ifndef CRYINCLUDE_EDITOR_PLUGIN_H
#define CRYINCLUDE_EDITOR_PLUGIN_H
#include "Include/IEditorClassFactory.h"
Code/Editor/PluginManager.h
-8
View File
@@ -7,14 +7,6 @@
#pragma once
////////////////////////////////////////////////////////////////////////////
//
// Crytek Engine Source File.
// Copyright (C), Crytek Studios, 2001-2012.
// -------------------------------------------------------------------------
// Description: The plugin manager, central point for loading/unloading plugins
//
////////////////////////////////////////////////////////////////////////////
#ifndef CRYINCLUDE_EDITOR_PLUGINMANAGER_H
#define CRYINCLUDE_EDITOR_PLUGINMANAGER_H
Code/Editor/Plugins/EditorCommon/EditorCommon.rc
BIN
View File
Binary file not shown.
Code/Editor/Plugins/FFMPEGPlugin/FFMPEGPlugin.h
+1 -4
View File
@@ -7,10 +7,7 @@
#pragma once
////////////////////////////////// CRYTEK ////////////////////////////////
//
// Crytek Engine Source File.
// Copyright (C), Crytek Studios, 2011.
////////////////////////////////////////////////////////////////////////////
// -------------------------------------------------------------------------
// File Name : FFMPEGPlugin.h
// Author : Jaewon Jung
Code/Editor/Settings.h
-14
View File
@@ -7,20 +7,6 @@
#pragma once
////////////////////////////////////////////////////////////////////////////
//
// Crytek Engine Source File.
// Copyright (C), Crytek Studios, 2002.
// -------------------------------------------------------------------------
// File name: settings.h
// Version: v1.00
// Created: 14/1/2003 by Timur.
// Compilers: Visual Studio.NET
// Description: General editor settings.
// -------------------------------------------------------------------------
// History:
//
////////////////////////////////////////////////////////////////////////////
#ifndef CRYINCLUDE_EDITOR_SETTINGS_H
#define CRYINCLUDE_EDITOR_SETTINGS_H
#include "SettingsManager.h"
Code/Editor/UsedResources.h
-11
View File
@@ -7,17 +7,6 @@
#pragma once
////////////////////////////////////////////////////////////////////////////
//
// Crytek Engine Source File.
// Copyright (C), Crytek Studios, 2001-2012
// -------------------------------------------------------------------------
// File name: UsedResources.h
// Created: 28/11/2003 by Timur.
// Description: Class to gather used resources
//
////////////////////////////////////////////////////////////////////////////
//! Class passed to resource gathering functions
#ifndef CRYINCLUDE_EDITOR_USEDRESOURCES_H
#define CRYINCLUDE_EDITOR_USEDRESOURCES_H
Code/Editor/WaitProgress.h
-6
View File
@@ -8,12 +8,6 @@
#pragma once
////////////////////////////////////////////////////////////////////////////
//
// Crytek Engine Source File.
// Copyright (C), Crytek Studios, 2002-2012.
// -------------------------------------------------------------------------
// File name: waitprogress.h
// Created: 10/5/2002 by Timur.
// Description: CWaitProgress class adds information about lengthy process
// Usage:
//