|
@@ -55,7 +55,9 @@ M.parse_model = function(mod_id)
|
|
for k, v in pairs(src) do
|
|
for k, v in pairs(src) do
|
|
if NO_INHERIT[k] then goto continue end
|
|
if NO_INHERIT[k] then goto continue end
|
|
if type(v) == "table" then
|
|
if type(v) == "table" then
|
|
- merge(v, dest[k] or {})
|
|
|
|
|
|
+ dest[k] = dest[k] or {}
|
|
|
|
+ assert(type(dest[k]) == "table")
|
|
|
|
+ merge(v, dest[k])
|
|
else
|
|
else
|
|
dest[k] = v
|
|
dest[k] = v
|
|
end
|
|
end
|
|
@@ -65,7 +67,6 @@ M.parse_model = function(mod_id)
|
|
local config = {}
|
|
local config = {}
|
|
|
|
|
|
for _, src_config in ipairs(hierarchy) do
|
|
for _, src_config in ipairs(hierarchy) do
|
|
- print("Merging:", src_config)
|
|
|
|
merge(src_config, config)
|
|
merge(src_config, config)
|
|
end
|
|
end
|
|
|
|
|