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

Merge pull request #527 from Azaezel/alpha40/stopTheBleeding_Materials

Browse source 
suppress deletion of temp material created by the editor
This commit is contained in:
Brian Roberts 2021-08-13 22:20:58 -05:00 • committed by GitHub
commit c9d2ec0f56
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -47,7 +47,7 @@ function MaterialEditorGui::establishMaterials(%this)
singleton CustomMaterial( materialEd_justAlphaMaterial )
{
mapTo = "matEd_mappedMatB";
texture[0] = materialEd_previewMaterial.diffuseMap[0];
texture[0] = materialEd_previewMaterial.getdiffuseMap(0);
};
//Custom shader to allow the display of just the alpha channel.
@ -176,7 +176,7 @@ function MaterialEditorGui::quit(%this)
// Now we can delete the preview materials and shaders
// knowing that there are no matinstances using them.
matEdCubeMapPreviewMat.delete();
materialEd_previewMaterial.delete();
//materialEd_previewMaterial.delete();
materialEd_justAlphaMaterial.delete();
materialEd_justAlphaShader.delete();
}