diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/material.tscript b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/material.tscript index c0707eb92..dea372e35 100644 --- a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/material.tscript +++ b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/material.tscript @@ -245,6 +245,11 @@ function GuiInspectorTypeMaterialAssetPtr::onControlDropped( %this, %payload, %p EWorldEditor.isDirty = true; } +function GuiInspectorTypeMaterialAssetRef::onControlDropped( %this, %payload, %position ) +{ + GuiInspectorTypeMaterialAssetPtr::onControlDropped( %this, %payload, %position ); +} + function GuiInspectorGroup::buildMaterialInheritListField(%this, %fieldName, %fieldLabel, %fieldDesc, %fieldDefaultVal, %fieldDataVals, %callbackName, %ownerObj) { %extent = 18; diff --git a/Templates/BaseGame/game/tools/materialEditor/scripts/materialEditor.ed.tscript b/Templates/BaseGame/game/tools/materialEditor/scripts/materialEditor.ed.tscript index 197c365b3..3614795ba 100644 --- a/Templates/BaseGame/game/tools/materialEditor/scripts/materialEditor.ed.tscript +++ b/Templates/BaseGame/game/tools/materialEditor/scripts/materialEditor.ed.tscript @@ -48,7 +48,7 @@ function MaterialEditorGui::establishMaterials(%this) }; } - if(!isObject(materialEd_previewMaterial)) + if(!isObject(materialEd_justAlphaMaterial)) { singleton CustomMaterial( materialEd_justAlphaMaterial ) { @@ -57,7 +57,7 @@ function MaterialEditorGui::establishMaterials(%this) }; } - if(!isObject(materialEd_previewMaterial)) + if(!isObject(materialEd_justAlphaShader)) { //Custom shader to allow the display of just the alpha channel. singleton ShaderData( materialEd_justAlphaShader ) @@ -526,7 +526,8 @@ function MaterialEditorGui::prepareActiveObject( %this, %override ) { %fieldName = %obj.getField(%i); - if( %obj.getFieldType(%fieldName) !$= "TypeMaterialAssetId" && %obj.getFieldType(%fieldName) !$= "TypeMaterialAssetPtr") + if( %obj.getFieldType(%fieldName) !$= "TypeMaterialAssetId" && %obj.getFieldType(%fieldName) !$= "TypeMaterialAssetPtr" + && %obj.getFieldType(%fieldName) !$= "TypeMaterialAssetRef") continue; if( !%canSupportMaterial )