Merge branch 'master' into dev

This commit is contained in:
Aaron Suen 2021-12-15 21:48:55 -05:00
commit 32df131204
2 changed files with 4 additions and 2 deletions

View File

@ -25,7 +25,8 @@ local function idx2str(idx, key)
end
if #keys == 1 then
local k = keys[1]
parts[#parts + 1] = key .. "_" .. idx2str(idx[k], k)
parts[#parts + 1] = (key and (key .. "_") or "")
.. idx2str(idx[k], k)
elseif #keys > 1 then
table_sort(keys)
for i = 1, #keys do

View File

@ -230,7 +230,8 @@ local function anim(name, len)
aspect_w = 16,
aspect_h = 16,
length = len
}
},
backface_culling = false
}
end
local function gray(suff)