TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-05 05:20:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge remote-tracking branch 'upstream/development' into GuiInspectorFields

Browse source
This commit is contained in:
marauder2k7 2023-07-03 19:19:14 +01:00
commit 4abd6d6bc2
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/forest/forestItem.cpp
View file

@ -65,7 +65,7 @@ void ForestItemData::initPersistFields()
addProtectedField( "shapeFile", TypeShapeFilename, Offset( mShapeName, ForestItemData ), &_setShapeData, &defaultProtectedGetFn,
"Shape file for this item type", AbstractClassRep::FIELD_HideInInspectors );
endGroup( "Shape(s)" );
endGroup( "Shapes" );
addGroup("Physics");
addField( "collidable", TypeBool, Offset( mCollidable, ForestItemData ),

2
Templates/BaseGame/game/tools/forestEditor/forestEditorGui.tscript
View file

@ -482,7 +482,7 @@ function ForestEditorInspector::inspect( %this, %obj )
%this.groupFilters = "+ForestBrushElement,-Ungrouped";
case "TSForestItemData":
%this.groupFilters = "+Media,+Wind";
%this.groupFilters = "+Shapes,+Physics,+Wind,";
default:
%this.groupFilters = "";