DProperty_Combo.Setup() 2nd parameter - optional

Facepunch · May 6, 2015 · 8f6b50b · 8f6b50b
1 parent 59c72cf
commit 8f6b50b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/garrysmod/lua/vgui/prop_combo.lua b/garrysmod/lua/vgui/prop_combo.lua
@@ -6,6 +6,8 @@ end
 
 function PANEL:Setup( vars )
 
+	vars = vars or {}
+
 	self:Clear()
 
 	local combo = vgui.Create( "DComboBox", self )

diff --git a/garrysmod/lua/vgui/prop_vectorcolor.lua b/garrysmod/lua/vgui/prop_vectorcolor.lua
@@ -7,12 +7,9 @@
 
 DEFINE_BASECLASS( "DProperty_Generic" )
 
-
 local PANEL = {}
 
 function PANEL:Init()
-
-
 end
 
 --
@@ -26,14 +23,14 @@ function PANEL:ValueChanged( newval, bForce )
 
 end
 
-
 function PANEL:Setup( vars )
 
+	vars = vars or {}
+
 	BaseClass.Setup( self, vars )
 
 	local __SetValue = self.SetValue
 
-
 	local btn = self:Add( "DButton" )
 	btn:Dock( LEFT )
 	btn:DockMargin( 0, 2, 4, 2 )
@@ -71,15 +68,13 @@ function PANEL:Setup( vars )
 		local col = Color( 255 * self.VectorValue.r, 255 * self.VectorValue.g, 255 * self.VectorValue.b, 255 )
 		color:SetColor( col )
 
-
 		local menu = DermaMenu()
-			menu:AddPanel( color );
+			menu:AddPanel( color )
 			menu:SetDrawBackground( false )
 		menu:Open( gui.MouseX() + 8, gui.MouseY() + 10 )
 
 	end
 
-
 	-- Set the value
 	self.SetValue = function( self, val )
 		__SetValue( self, val )