temporarily remove primitive support

major changes to primitive addon

lua/autorun/prop2mesh.lua

@@ -42,7 +42,7 @@ if SERVER then
 	AddCSLuaFile("prop2mesh/cl_meshlab.lua")
 	AddCSLuaFile("prop2mesh/cl_modelfixer.lua")
 	AddCSLuaFile("prop2mesh/cl_editor.lua")
-	AddCSLuaFile("prop2mesh/compat/cl_primitive.lua")
+	--AddCSLuaFile("prop2mesh/compat/cl_primitive.lua")
 	AddCSLuaFile("prop2mesh/sh_netstream.lua")
 
 	include("prop2mesh/sh_netstream.lua")
@@ -92,7 +92,7 @@ elseif CLIENT then
 	include("prop2mesh/cl_meshlab.lua")
 	include("prop2mesh/cl_modelfixer.lua")
 	include("prop2mesh/cl_editor.lua")
-	include("prop2mesh/compat/cl_primitive.lua")
+	--include("prop2mesh/compat/cl_primitive.lua")
 
 	concommand.Add("prop2mesh_debug_bodygroups", function(ply, cmd, args)
 		local eid = tonumber(args[1])

lua/prop2mesh/cl_editor.lua

@@ -1528,7 +1528,8 @@ function PANEL:RemakeTree()
 
 		for k, v in ipairs(condata) do
 			local root = v.objd and objlist or mdllist
-			local name = v.prop or v.holo or v.objn or v.objd or (v.primitive and "primitive_" .. v.primitive.construct)
+			--local name = v.prop or v.holo or v.objn or v.objd or (v.primitive and "primitive_" .. v.primitive.construct)
+			local name = v.prop or v.holo or v.objn or v.objd
 			local part = root:AddNode(string.format("[%d] %s", k, string.GetFileFromFilename(name)))
 			part:SetIcon("icon16/brick.png")
 

lua/prop2mesh/cl_meshlab.lua

@@ -201,6 +201,7 @@ end
 --[[
 
 ]]
+/*
 local function getVertsFromPrimitive(partnext, meshtex, vmins, vmaxs, direct)
 	if partnext.vsmooth == 1 and partnext.primitive then
 		partnext.primitive.modv = string.gsub(partnext.primitive.modv or "", "(normals=%d+)", "")
@@ -298,6 +299,7 @@ local function getVertsFromPrimitive(partnext, meshtex, vmins, vmaxs, direct)
 
 	return partverts
 end
+*/
 
 local meshmodelcache
 local function getVertsFromMDL(partnext, meshtex, vmins, vmaxs, direct)
@@ -689,6 +691,8 @@ local function getMeshFromData(data, uvs, direct, split)
 			else
 				print(opv)
 			end
+		end
+		/*
 		elseif partnext.primitive then
 			local valid, opv = pcall(getVertsFromPrimitive, partnext, meshtex, vmins, vmaxs, direct)
 			if valid and opv then
@@ -697,6 +701,7 @@ local function getMeshFromData(data, uvs, direct, split)
 				print(opv)
 			end
 		end
+		*/
 
 		if partverts then
 			meshpcount = meshpcount + 1

lua/prop2mesh/sv_entparts.lua

@@ -263,6 +263,7 @@ entclass.sent_prop2mesh_legacy = function(partlist, ent, worldpos, worldang)
 	end
 end
 
+/*
 entclass.primitive_shape = function(partlist, ent, worldpos, worldang)
 	if not ent._primitive_GetVars then return end
 
@@ -291,3 +292,4 @@ entclass.primitive_rail_slider = function(partlist, ent, worldpos, worldang)
 
 	partlist[#partlist + 1] = part
 end
+*/

lua/weapons/gmod_tool/stools/prop2mesh.lua

@@ -681,7 +681,7 @@ local ConVars = {
 	["tool_filter_ipacf"]    = 1, -- procedural armor
 	]]
 
-	["tool_filter_ilist"]    = "prop_effect, acf_armor, sent_prop2mesh_legacy, primitive_rail_slider",
+	["tool_filter_ilist"]    = "prop_effect, acf_armor, sent_prop2mesh_legacy", --primitive_rail_slider",
 }
 TOOL.ClientConVar = ConVars
 
@@ -814,6 +814,7 @@ local function BuildPanel_ToolSettings(self)
 		choices[id] = v
 	end
 
+	/*
 	if g_primitive then
 		combo:AddSpacer()
 
@@ -823,6 +824,7 @@ local function BuildPanel_ToolSettings(self)
 		local v = "primitive_rail_slider"
 		choices[combo:AddChoice(v, onChoose, nil, class_list_filter[v] and "icon16/cross.png")] = v
 	end
+	*/
 
 	combo:AddSpacer()
 	combo:AddChoice("cancel")