TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-15 08:34:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

various misc fixes from merge.

Browse source
This commit is contained in:
Jeff Hutchinson 2021-09-01 22:36:59 -04:00
parent 17231ca9fb
commit b0549118b6
4 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/core/util/str.cpp
View file

@ -284,8 +284,8 @@ class String::StringData : protected StringDataImpl
delete [] mUTF16; delete [] mUTF16;
} }
void* TORQUE_NOINLINE operator new(size_t size, U32 len); TORQUE_NOINLINE void* 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, DataChunker& chunker );
void operator delete(void *); void operator delete(void *);
bool isShared() const bool isShared() const

2
Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/shape.tscript
View file

@ -340,7 +340,7 @@ function AssetBrowser::onShapeAssetEditorDropped(%this, %assetDef, %position)
%newStatic = new TSStatic() %newStatic = new TSStatic()
{ {
position = %pos; position = %position;
shapeAsset = %assetId; shapeAsset = %assetId;
}; };

1
Templates/BaseGame/game/tools/gui/editorSettingsWindow.ed.tscript
View file

@ -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.addSettingsField("Assets/New/alwaysPromptModuleTarget", "Always Prompt Target Module", "bool", "If off, use the default module");
SettingsInspector.endGroup(); SettingsInspector.endGroup();
%formattedConfigList = "";
for(%i=0; %i < ImportAssetWindow.importConfigsList.Count(); %i++) for(%i=0; %i < ImportAssetWindow.importConfigsList.Count(); %i++)
{ {
%configName = ImportAssetWindow.importConfigsList.getKey(%i); %configName = ImportAssetWindow.importConfigsList.getKey(%i);

2
Templates/BaseGame/game/tools/worldEditor/scripts/interfaces/terrainMaterialDlg.ed.tscript
View file

@ -298,7 +298,7 @@ function TerrainMaterialDlg::changeTerrainMatMapAsset(%this)
%targetMap.setBitmap( %image ); %targetMap.setBitmap( %image );
%targetMapName = %mapName @ "AssetId"; %targetMapName = %targetMap @ "AssetId";
%targetMapName.setText(%imgAsset); %targetMapName.setText(%imgAsset);
TerrainMaterialDlg.matDirty = true; TerrainMaterialDlg.matDirty = true;