Merge pull request #1780 from thegrb93/material-modifiers

Add entity modifiers for e2 material setting
wiremod · Nov 25, 2018 · 4a9c97f · 4a9c97f
2 parents 14ea40f + 54712f2
commit 4a9c97f
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/lua/entities/gmod_wire_expression2/core/e2lib.lua b/lua/entities/gmod_wire_expression2/core/e2lib.lua
@@ -26,11 +26,16 @@ E2Lib.setPos = WireLib.setPos
 E2Lib.setAng = WireLib.setAng
 
 function E2Lib.setMaterial(ent, material)
-	ent:SetMaterial(WireLib.IsValidMaterial(material))
+	material = WireLib.IsValidMaterial(material)
+	ent:SetMaterial(material)
+	duplicator.StoreEntityModifier(ent, "material", { MaterialOverride = material })
 end
 
 function E2Lib.setSubMaterial(ent, index, material)
-	ent:SetSubMaterial(index,WireLib.IsValidMaterial(material))
+	index = math.Clamp(index, 0, 255)
+	material = WireLib.IsValidMaterial(material)
+	ent:SetSubMaterial(index, material)
+	duplicator.StoreEntityModifier(ent, "submaterial", { ["SubMaterialOverride_"..index] = material })
 end
 
 -- getHash