Finish the previous merge issue

core/src/main/java/com/seibel/lod/core/a7/datatype/column/ColumnRenderSource.java

@@ -210,9 +210,8 @@ public class ColumnRenderSource implements LodRenderSource, IColumnDatatype {
             for (int j = 0; j < verticalSize; j++)
             {
                 long current = dataContainer[i * verticalSize + j];
-				// TODO
-//                if (ColumnFormat.doesItExist(current))
-//                    current = ColumnFormat.overrideGenerationMode(current, (byte) 1);
+                if (ColumnFormat.doesItExist(current))
+                    current = ColumnFormat.overrideGenerationMode(current, (byte) 1);
                 output.writeLong(Long.reverseBytes(current));
             }
             if (!ColumnFormat.doesItExist(dataContainer[i]))

core/src/main/java/com/seibel/lod/core/a7/datatype/column/accessor/ColumnFormat.java

@@ -86,6 +86,7 @@ public class ColumnFormat {
 
     public final static long HEIGHT_SHIFTED_MASK = HEIGHT_MASK << HEIGHT_SHIFT;
     public final static long DEPTH_SHIFTED_MASK = DEPTH_MASK << DEPTH_SHIFT;
+    public final static long GEN_TYPE_SHIFTED_MASK = GEN_TYPE_MASK << GEN_TYPE_SHIFT;
 
     public final static long VOID_SETTER = HEIGHT_SHIFTED_MASK | DEPTH_SHIFTED_MASK;
 
@@ -218,6 +219,10 @@ public class ColumnFormat {
         return genMode == 0 ? 1 : genMode;
     }
 
+    public static long overrideGenerationMode(long current, byte b) {
+        return (current & ~GEN_TYPE_SHIFTED_MASK) | ((b & GEN_TYPE_MASK) << GEN_TYPE_SHIFT);
+    }
+
     public static boolean isVoid(long dataPoint) {
         return (((dataPoint >>> DEPTH_SHIFT) & HEIGHT_DEPTH_MASK) == 0);
     }