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

Merge pull request #1461 from Azaezel/alpha41/CreateCompositeCleanups

Browse source 
cleanup strays
This commit is contained in:
Brian Roberts 2025-05-18 08:29:05 -05:00 • committed by GitHub
commit 2a9aa3a9d5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/gfx/gfxTextureHandle.cpp
View file

@ -80,9 +80,7 @@ bool GFXTexHandle::set(const String &texNameR, const String &texNameG, const Str
// Clear the existing texture first, so that // Clear the existing texture first, so that
// its memory is free for the new allocation. // its memory is free for the new allocation.
free(); free();
// Create and set the new texture.
AssertFatal( texNameR.isNotEmpty(), "Texture name is empty" );
StrongObjectRef::set( TEXMGR->createCompositeTexture( texNameR, texNameG, texNameB, texNameA, inputKey, profile ) ); StrongObjectRef::set( TEXMGR->createCompositeTexture( texNameR, texNameG, texNameB, texNameA, inputKey, profile ) );
#ifdef TORQUE_DEBUG #ifdef TORQUE_DEBUG

1
Engine/source/materials/processedMaterial.cpp
View file

@ -172,6 +172,7 @@ bool ProcessedMaterial::stepInstance()
String ProcessedMaterial::_getTexturePath(const String& filename) String ProcessedMaterial::_getTexturePath(const String& filename)
{ {
if (filename.isEmpty()) return filename;
// if '/', then path is specified, use it. // if '/', then path is specified, use it.
if( filename.find('/') != String::NPos ) if( filename.find('/') != String::NPos )
{ {

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

@ -1210,7 +1210,6 @@ function MaterialEditorGui::guiSync( %this, %material )
MaterialEditorPropertiesWindow-->glowMulTextEdit.setText((%material).glowMul[%layer]); MaterialEditorPropertiesWindow-->glowMulTextEdit.setText((%material).glowMul[%layer]);
MaterialEditorPropertiesWindow-->glowMulSlider.setValue((%material).glowMul[%layer]); MaterialEditorPropertiesWindow-->glowMulSlider.setValue((%material).glowMul[%layer]);
MaterialEditorPropertiesWindow-->glowCheckbox.setValue((%material).glow[%layer]); MaterialEditorPropertiesWindow-->glowCheckbox.setValue((%material).glow[%layer]);
MaterialEditorPropertiesWindow-->emissiveCheckbox.setValue((%material).emissive[%layer]);
MaterialEditorPropertiesWindow-->receiveShadowsCheckbox.setValue((%material).receiveShadows[%layer]); MaterialEditorPropertiesWindow-->receiveShadowsCheckbox.setValue((%material).receiveShadows[%layer]);
MaterialEditorPropertiesWindow-->ignoreLightingCheckbox.setValue((%material).ignoreLighting[%layer]); MaterialEditorPropertiesWindow-->ignoreLightingCheckbox.setValue((%material).ignoreLighting[%layer]);
MaterialEditorPropertiesWindow-->parallaxTextEdit.setText((%material).parallaxScale[%layer]); MaterialEditorPropertiesWindow-->parallaxTextEdit.setText((%material).parallaxScale[%layer]);