TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-11 14:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

- Fixes issue with resizing for the inspector panel of the updated MatEd where it would cut off

Browse source 
- Fixes refresh behavior where it'd refresh while you were doing a 'long action' like dragging a slider or range value
- Fixes issue where the scroll position would reset when modifying some fields
- Fixed issue where saving a composite texture could save it to the game root directory
- Fixed issue where opening the mat ed for the first time with an object selected could have the inspector not inspect the object
This commit is contained in:
JeffR 2025-08-06 01:34:59 -05:00
parent 07c67f2935
commit c894728644
4 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Templates/BaseGame/game/tools/materialEditor/scripts/materialEditor.ed.tscript
View file

@ -526,7 +526,7 @@ function MaterialEditorGui::prepareActiveObject( %this, %override )
{
%fieldName = %obj.getField(%i);
if( %obj.getFieldType(%fieldName) !$= "TypeMaterialAssetId" /*&& %obj.getFieldType(%fieldName) !$= "TypeMaterialName"*/)
if( %obj.getFieldType(%fieldName) !$= "TypeMaterialAssetId" && %obj.getFieldType(%fieldName) !$= "TypeMaterialAssetPtr")
continue;
if( !%canSupportMaterial )
@ -1022,6 +1022,7 @@ function MaterialEditorGui::guiSync( %this )
}
MaterialEditorPropInspector.loadCollapseState();
MaterialEditorPropInspector.loadScrollState();
cancel(MaterialEditorGui.refreshSchedule);
@ -1990,12 +1991,15 @@ function MaterialEditorGui::doSwapMaterial(%this, %materialAsset)
function MaterialEditorPropInspector::onInspectorFieldModified(%this, %object, %fieldName, %arrayIndex, %oldValue, %newValue)
{
MaterialEditorPropInspector.saveScrollState();
if(%arrayIndex !$= "" && %arrayIndex !$= "(null)")
MaterialEditorGui.updateActiveMaterial(%fieldName @ "[" @ %arrayIndex @ "]", %newValue);
else
MaterialEditorGui.updateActiveMaterial(%fieldName, %newValue);
MaterialEditorGui.refreshSchedule = MaterialEditorGui.schedule(32, "guiSync");
cancel(MaterialEditorGui.refreshSchedule);
MaterialEditorGui.refreshSchedule = MaterialEditorGui.schedule(256, "guiSync");
}
function MaterialEditorPropInspector::getScrollbar(%this)
@ -2026,7 +2030,7 @@ function MaterialEditorPropInspector::onPostInspectObject(%this, %obj)
function MaterialEditorPropInspector::saveScrollState(%this)
{
%this.scrollPos = %this.getScrollbar().getScrollPosition();
//echo(%this.getName() @ "::saveScrollState" SPC %this.scrollPos);
echo(%this.getName() @ "::saveScrollState" SPC %this.scrollPos);
}
function MaterialEditorPropInspector::loadScrollState(%this)
@ -2034,7 +2038,7 @@ function MaterialEditorPropInspector::loadScrollState(%this)
if (%this.scrollPos $= "")
return;
%this.getScrollbar().setScrollPosition(%this.scrollPos.x, %this.scrollPos.y);
//echo(%this.getName() @ "::loadScrollState" SPC %this.scrollPos);
echo(%this.getName() @ "::loadScrollState" SPC %this.scrollPos);
}