From 03c8110d026689e01e87ec2e49e18bf32b30cbb6 Mon Sep 17 00:00:00 2001 From: Steve Pham <82231385+spham-amzn@users.noreply.github.com> Date: Wed, 30 Jun 2021 08:27:43 -0700 Subject: [PATCH] Replaced remaining CryTek copyright notices - Replaced 'CryTek' with 'Contributors to the Open 3D Engine Project' in ConsoleHelpGen.cpp (#1667) - Removed remaining 'Crytek Engine Source File.. Copyright (C), Crytek Studios' in various Editor source files - Replaced 'modifications by CryTek' and 'modifications by Amazon' with 'Modified from original' --- Code/Legacy/CrySystem/ConsoleHelpGen.cpp | 8 ++++---- Code/Sandbox/Editor/EditorDefs.h | 9 --------- Code/Sandbox/Editor/NewLevelDialog.h | 14 -------------- Code/Sandbox/Editor/NewTerrainDialog.h | 14 -------------- Code/Sandbox/Editor/Plugin.h | 9 --------- Code/Sandbox/Editor/PluginManager.h | 8 -------- Code/Sandbox/Editor/Settings.h | 14 -------------- Code/Sandbox/Editor/UsedResources.h | 11 ----------- Code/Sandbox/Editor/WaitProgress.h | 6 ------ .../Plugins/EditorCommon/EditorCommon.rc | Bin 2546 -> 2326 bytes .../Plugins/FFMPEGPlugin/FFMPEGPlugin.h | 5 +---- .../External/CubeMapGen/CBBoxInt32.cpp | 3 +-- .../External/CubeMapGen/CBBoxInt32.h | 3 +-- .../External/CubeMapGen/CCubeMapProcessor.cpp | 3 +-- .../External/CubeMapGen/CCubeMapProcessor.h | 3 +-- .../External/CubeMapGen/CImageSurface.cpp | 3 +-- .../External/CubeMapGen/VectorMacros.h | 2 +- 17 files changed, 11 insertions(+), 104 deletions(-) diff --git a/Code/Legacy/CrySystem/ConsoleHelpGen.cpp b/Code/Legacy/CrySystem/ConsoleHelpGen.cpp index 2845ca14ae..fb95164334 100644 --- a/Code/Legacy/CrySystem/ConsoleHelpGen.cpp +++ b/Code/Legacy/CrySystem/ConsoleHelpGen.cpp @@ -90,10 +90,10 @@ void CConsoleHelpGen::StartPage(FILE* f, const char* szPageName, const char* szP { fprintf(f, "%s", szPageName); fprintf(f, "", szPageDescription); - fprintf(f, ""); - fprintf(f, ""); - fprintf(f, ""); - fprintf(f, ""); + fprintf(f, ""); + fprintf(f, ""); + fprintf(f, ""); + fprintf(f, ""); fprintf(f, ""); fprintf(f, ""); fprintf(f, ""); diff --git a/Code/Sandbox/Editor/EditorDefs.h b/Code/Sandbox/Editor/EditorDefs.h index dc31c652f6..ac17cc926b 100644 --- a/Code/Sandbox/Editor/EditorDefs.h +++ b/Code/Sandbox/Editor/EditorDefs.h @@ -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 diff --git a/Code/Sandbox/Editor/NewLevelDialog.h b/Code/Sandbox/Editor/NewLevelDialog.h index 4a6fd64a00..d4f033d490 100644 --- a/Code/Sandbox/Editor/NewLevelDialog.h +++ b/Code/Sandbox/Editor/NewLevelDialog.h @@ -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 diff --git a/Code/Sandbox/Editor/NewTerrainDialog.h b/Code/Sandbox/Editor/NewTerrainDialog.h index 7b6265e322..ef4723b0c0 100644 --- a/Code/Sandbox/Editor/NewTerrainDialog.h +++ b/Code/Sandbox/Editor/NewTerrainDialog.h @@ -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 diff --git a/Code/Sandbox/Editor/Plugin.h b/Code/Sandbox/Editor/Plugin.h index 1da0be8f63..f7e46d979f 100644 --- a/Code/Sandbox/Editor/Plugin.h +++ b/Code/Sandbox/Editor/Plugin.h @@ -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" diff --git a/Code/Sandbox/Editor/PluginManager.h b/Code/Sandbox/Editor/PluginManager.h index 2cd0841f08..5f0600ec88 100644 --- a/Code/Sandbox/Editor/PluginManager.h +++ b/Code/Sandbox/Editor/PluginManager.h @@ -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 diff --git a/Code/Sandbox/Editor/Settings.h b/Code/Sandbox/Editor/Settings.h index 7618a11485..a4cfdf1163 100644 --- a/Code/Sandbox/Editor/Settings.h +++ b/Code/Sandbox/Editor/Settings.h @@ -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" diff --git a/Code/Sandbox/Editor/UsedResources.h b/Code/Sandbox/Editor/UsedResources.h index 13362f5472..93b42429c2 100644 --- a/Code/Sandbox/Editor/UsedResources.h +++ b/Code/Sandbox/Editor/UsedResources.h @@ -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 diff --git a/Code/Sandbox/Editor/WaitProgress.h b/Code/Sandbox/Editor/WaitProgress.h index da04a053ef..e4e3a30873 100644 --- a/Code/Sandbox/Editor/WaitProgress.h +++ b/Code/Sandbox/Editor/WaitProgress.h @@ -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: // diff --git a/Code/Sandbox/Plugins/EditorCommon/EditorCommon.rc b/Code/Sandbox/Plugins/EditorCommon/EditorCommon.rc index ebb41f11927a460fc3ac81fb7c4017efe93fe196..77deebb598990e925cf97758d98877e71ec79872 100644 GIT binary patch delta 135 zcmew)JWXiB1Qu0ihJ1!Rh7yJ%hD?SehEgCaAIL6dPyn+)WCla(WNubP-T#Medl@G?vCAowrG4^x7VXVq9CsK2ZK)q< delta 393 zcmaiwJqp4=6og0crx6RSCEG_lfSopKAxgjl#QbP5CJ>{bO|BpYY`ucub!@zXCvf%& zVjdvAB<+u1$UAC1eQXmqiHjXh#SXv1M$p#_B@X9w;4UNWz>(y?Gpc$6STAksA@ zF?_Bm7TnXb&l!r5j++(6G zJ6DurPFfQ%x?K~~XCxy_uoLi-xIRYcVIamSuhI~O4XrMF9V{fsVIRq TVGHBS!>RhsoV-rw6{y= diff --git a/Code/Sandbox/Plugins/FFMPEGPlugin/FFMPEGPlugin.h b/Code/Sandbox/Plugins/FFMPEGPlugin/FFMPEGPlugin.h index f16853cbe8..07119c6d6f 100644 --- a/Code/Sandbox/Plugins/FFMPEGPlugin/FFMPEGPlugin.h +++ b/Code/Sandbox/Plugins/FFMPEGPlugin/FFMPEGPlugin.h @@ -7,10 +7,7 @@ #pragma once -////////////////////////////////// CRYTEK //////////////////////////////// -// -// Crytek Engine Source File. -// Copyright (C), Crytek Studios, 2011. +//////////////////////////////////////////////////////////////////////////// // ------------------------------------------------------------------------- // File Name : FFMPEGPlugin.h // Author : Jaewon Jung diff --git a/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CBBoxInt32.cpp b/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CBBoxInt32.cpp index e8697c7c27..271013adef 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CBBoxInt32.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CBBoxInt32.cpp @@ -6,8 +6,7 @@ //============================================================================= // (C) 2005 ATI Research, Inc., All rights reserved. //============================================================================= -// modifications by Crytek GmbH -// modifications by Amazon +// Modified from original #include diff --git a/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CBBoxInt32.h b/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CBBoxInt32.h index 056cb25425..53f32f8cd5 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CBBoxInt32.h +++ b/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CBBoxInt32.h @@ -5,8 +5,7 @@ //============================================================================= // (C) 2005 ATI Research, Inc., All rights reserved. //============================================================================= -// modifications by Crytek GmbH -// modifications by Amazon +// Modified from original #pragma once diff --git a/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CCubeMapProcessor.cpp b/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CCubeMapProcessor.cpp index df31067af0..8264003b0b 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CCubeMapProcessor.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CCubeMapProcessor.cpp @@ -1,8 +1,7 @@ //============================================================================= // (C) 2005 ATI Research, Inc., All rights reserved. //============================================================================= -// modifications by Crytek GmbH -// modifications by Amazon +// Modified from original #include #include "CCubeMapProcessor.h" diff --git a/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CCubeMapProcessor.h b/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CCubeMapProcessor.h index be54b98e6a..4a29e8621a 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CCubeMapProcessor.h +++ b/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CCubeMapProcessor.h @@ -6,8 +6,7 @@ //-------------------------------------------------------------------------------------- // (C) 2005 ATI Research, Inc., All rights reserved. //-------------------------------------------------------------------------------------- -// modifications by Crytek GmbH -// modifications by Amazon +// Modified from original #pragma once diff --git a/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CImageSurface.cpp b/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CImageSurface.cpp index 3b055699e2..592ada0910 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CImageSurface.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CImageSurface.cpp @@ -12,8 +12,7 @@ //-------------------------------------------------------------------------------------- // (C) 2005 ATI Research, Inc., All rights reserved. //-------------------------------------------------------------------------------------- -// modifications by Crytek GmbH -// modifications by Amazon +// Modified from original #include diff --git a/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/VectorMacros.h b/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/VectorMacros.h index 7546457c79..37d15f1c1b 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/VectorMacros.h +++ b/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/VectorMacros.h @@ -15,7 +15,7 @@ //-------------------------------------------------------------------------------------- // (C) 2001-2005 ATI Research, Inc. All rights reserved. //-------------------------------------------------------------------------------------- -// modifications by Crytek GmbH +// Modified from original //disable warning about doubles being converted down to float #pragma warning (disable : 4244 )