Merge pull request #1400 from CapsAdmin/master

Merge master into develop

Author: thegrb93

lua/pac3/editor/client/tools.lua

@@ -490,7 +490,7 @@ pace.AddTool(L"Convert group of models to Expression 2 holograms", function(part
 	local str_ref =
 	[[
 
-    I++, HN++, HT[HN,table] = table(I, Base, Base, 0, POSITION, ANGLES, SCALE, MODEL, MATERIAL, vec4(COLOR, ALPHA), SKIN)
+    I++, HN++, HT[HN,table] = table(I, Base, Base, 0, POSITION, ANGLES, SCALE, MODEL, MATERIAL, vec4(COLOR, ALPHA), SKIN, INVERT)
 	]]
 
 	local str_header =
@@ -514,7 +514,7 @@ if (first() | dupefinished()) {
     Indices = 1
 
         #- Data structure
-        #- HN++, HT[HN, table] = table(Index, Local Entity (Entity:toWorld()), Parent Entity, ScaleType (Default 0), Pos, Ang, Scale, Model, Material, Color, Skin)
+        #- HN++, HT[HN, table] = table(Index, Local Entity (Entity:toWorld()), Parent Entity, ScaleType (Default 0), Pos, Ang, Scale, Model, Material, Color, Skin, Invert)
         #- CN++, CT[CN, table] = table(Index, Clip Index, Pos, Ang)
 
         #- Editing holograms
@@ -557,6 +557,7 @@ if (first() | dupefinished()) {
             holoMaterial(Index, This[9, string])
             holoColor(Index, This[10, vector4])
             holoSkin(Index, This[11, number])
+            holoInvertModel(Index, This[12, number])
         }
 
         if (ToggleShading) { holoDisableShading(Index, 1) }
@@ -676,6 +677,7 @@ elseif (CoreStatus == "RunThisCode") {
 			MATERIAL = ("%q"):format(part:GetMaterial()),
 			MODEL = ("%q"):format(part:GetModel()),
 			SKIN = part.GetSkin and part:GetSkin() or "0",
+			INVERT = part:GetInvert() and "1" or "0",
 			PARENT = "entity()"
 		})
 

lua/pac3/extra/client/wire_expression_extension.lua

@@ -8,6 +8,8 @@ end)
 
 local function SetKeyValue(ply, ent, unique_id, key, val)
 	local set = "Set" .. key
+	
+	if ent == game.GetWorld() then ent = pac.WorldEntity end
 
 	local part = pac.GetPartFromUniqueID(pac.Hash(ply), unique_id)
 	if not IsValid( part ) then return end