From aebd17e60a349db417e6d7cef54d97e116f566dc Mon Sep 17 00:00:00 2001
From: IhatemyISP <ian.corbitt@icloud.com>
Date: Wed, 26 Feb 2020 20:56:25 -0500
Subject: [PATCH] Deconflicting PR

---
 src/key.scad            | 2 +-
 src/layouts/layout.scad | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/key.scad b/src/key.scad
index 8452d2c..f58a6a7 100644
--- a/src/key.scad
+++ b/src/key.scad
@@ -327,7 +327,7 @@ module clearance_check() {
   }
 }
 
-module legends(depth) {
+module legends(depth=0) {
   if ($legends_dual) {
     front_placement() {
       if (len($legends_front) > 0) {
diff --git a/src/layouts/layout.scad b/src/layouts/layout.scad
index 1d9ef28..a22115e 100644
--- a/src/layouts/layout.scad
+++ b/src/layouts/layout.scad
@@ -37,6 +37,9 @@ module layout(list, profile="dcs", legends=undef, legends_front=undef, row_sculp
       if (key_length >= 1) {
         translate_u(column_distance - (key_length/2), -row) {
           key_profile(profile, row_sculpting, column_value) u(key_length) legend(legends ? legends[row][column] : "") legend_front(legends_front ? legends_front[row][column] : "") cherry() { // (row+4) % 5 + 1
+          $row = row;
+          $column = column;
+          
             if (key_length == 6.25) {
               spacebar() {
                 if ($children) {