Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -879,6 +879,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow,EditorGuiGroup) {
tooltipProfile = "GuiToolTipProfile";
tooltip = "Select the method used to auto-generate the collision geometry";
internalName = "colType";
command = "ShapeEdColWindow.onColTypeSelected();";
};
new GuiTextCtrl() {
text = "Fit Target";
Expand Down Expand Up @@ -1127,7 +1128,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow,EditorGuiGroup) {
new GuiBitmapCtrl() {
BitmapAsset = "ToolsModule:inactive_overlay_image";
position = "0 47";
extent = "199 178";
extent = "342 178";
profile = "ToolsGuiDefaultProfile";
visible = "0";
tooltipProfile = "GuiToolTipProfile";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3112,7 +3112,6 @@ function ShapeEdColWindow::update_onCollisionChanged( %this )

if ( %this-->colType.getText() $= "Convex Hulls" )
{
%this-->hullInactive.setVisible( false );
%this-->hullDepth.setValue( getField( %colData, 2 ) );
%this-->hullDepthText.setText( mFloor( %this-->hullDepth.getValue() ) );
%this-->hullMergeThreshold.setValue( getField( %colData, 3 ) );
Expand All @@ -3130,6 +3129,15 @@ function ShapeEdColWindow::update_onCollisionChanged( %this )
%fillModeID = %this-->fillMode.findText( getField( %colData, 9 ) );
%this-->fillMode.setSelected( %fillModeID, false );
}
}

function ShapeEdColWindow::onColTypeSelected(%this)
{

if ( %this-->colType.getText() $= "Convex Hulls" )
{
%this-->hullInactive.setVisible( false );
}
else
{
%this-->hullInactive.setVisible( true );
Expand Down
Loading