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

Merge pull request #572 from JeffProgrammer/fix-material-editor

Browse source 
Fix local variable being eval'd in materialEditor
This commit is contained in:
Brian Roberts 2021-09-11 16:52:46 -05:00 • committed by GitHub
commit c003cad3d0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1120,8 +1120,7 @@ function MaterialEditorGui::updateActiveMaterial(%this, %propertyField, %value,
%action.isSlider = %isSlider; %action.isSlider = %isSlider;
%action.onMouseUp = %onMouseUp; %action.onMouseUp = %onMouseUp;
%action.newValue = %value; %action.newValue = %value;
eval( "%action.oldValue = " @ MaterialEditorGui.currentMaterial @ "." @ %propertyField @ ";"); %action.oldValue = "\"" @ MaterialEditorGui.currentMaterial.getFieldValue(%propertyField) @ "\"";
%action.oldValue = "\"" @ %action.oldValue @ "\"";
MaterialEditorGui.submitUndo( %action ); MaterialEditorGui.submitUndo( %action );
} }