From b0549118b64629ad489fa0f2b5cd9bc297c42dda Mon Sep 17 00:00:00 2001 From: Jeff Hutchinson Date: Wed, 1 Sep 2021 22:36:59 -0400 Subject: [PATCH] various misc fixes from merge. --- Engine/source/core/util/str.cpp | 4 ++-- .../game/tools/assetBrowser/scripts/assetTypes/shape.tscript | 2 +- .../BaseGame/game/tools/gui/editorSettingsWindow.ed.tscript | 1 + .../scripts/interfaces/terrainMaterialDlg.ed.tscript | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Engine/source/core/util/str.cpp b/Engine/source/core/util/str.cpp index bec26609b..4feb5c20a 100644 --- a/Engine/source/core/util/str.cpp +++ b/Engine/source/core/util/str.cpp @@ -284,8 +284,8 @@ class String::StringData : protected StringDataImpl delete [] mUTF16; } - void* TORQUE_NOINLINE operator new(size_t size, U32 len); - void* TORQUE_NOINLINE operator new( size_t size, U32 len, DataChunker& chunker ); + TORQUE_NOINLINE void* operator new(size_t size, U32 len); + TORQUE_NOINLINE void* operator new( size_t size, U32 len, DataChunker& chunker ); void operator delete(void *); bool isShared() const diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/shape.tscript b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/shape.tscript index 4bf17453a..422d7238b 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/shape.tscript +++ b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/shape.tscript @@ -340,7 +340,7 @@ function AssetBrowser::onShapeAssetEditorDropped(%this, %assetDef, %position) %newStatic = new TSStatic() { - position = %pos; + position = %position; shapeAsset = %assetId; }; diff --git a/Templates/BaseGame/game/tools/gui/editorSettingsWindow.ed.tscript b/Templates/BaseGame/game/tools/gui/editorSettingsWindow.ed.tscript index f9a025b59..c4ed141b3 100644 --- a/Templates/BaseGame/game/tools/gui/editorSettingsWindow.ed.tscript +++ b/Templates/BaseGame/game/tools/gui/editorSettingsWindow.ed.tscript @@ -515,6 +515,7 @@ function ESettingsWindow::getAssetEditingSettings(%this) SettingsInspector.addSettingsField("Assets/New/alwaysPromptModuleTarget", "Always Prompt Target Module", "bool", "If off, use the default module"); SettingsInspector.endGroup(); + %formattedConfigList = ""; for(%i=0; %i < ImportAssetWindow.importConfigsList.Count(); %i++) { %configName = ImportAssetWindow.importConfigsList.getKey(%i); diff --git a/Templates/BaseGame/game/tools/worldEditor/scripts/interfaces/terrainMaterialDlg.ed.tscript b/Templates/BaseGame/game/tools/worldEditor/scripts/interfaces/terrainMaterialDlg.ed.tscript index 296fea200..0a47f96ee 100644 --- a/Templates/BaseGame/game/tools/worldEditor/scripts/interfaces/terrainMaterialDlg.ed.tscript +++ b/Templates/BaseGame/game/tools/worldEditor/scripts/interfaces/terrainMaterialDlg.ed.tscript @@ -298,7 +298,7 @@ function TerrainMaterialDlg::changeTerrainMatMapAsset(%this) %targetMap.setBitmap( %image ); - %targetMapName = %mapName @ "AssetId"; + %targetMapName = %targetMap @ "AssetId"; %targetMapName.setText(%imgAsset); TerrainMaterialDlg.matDirty = true;