2 files changed, 29 insertions, 22 deletions

diff --git a/src/scene/scene_graph.h b/src/scene/scene_graph.h
index a26f828..0b1f7d0 100644
--- a/src/scene/scene_graph.h
+++ b/src/scene/scene_graph.h
@@ -6,35 +6,41 @@
 // NOTE: SceneMemory guarantees that index 0 can be regarded as an invalid
 // index.
 
-#define MEM_GET(INDEX)                    \
-  _Generic((INDEX), camera_idx            \
-           : mem_get_camera, material_idx \
-           : mem_get_material, mesh_idx   \
-           : mem_get_mesh, mesh_link_idx  \
-           : mem_get_mesh_link, node_idx  \
-           : mem_get_node, object_idx     \
-           : mem_get_object, scene_idx    \
-           : mem_get_scene)(INDEX)
+#define MEM_GET(INDEX)                  \
+  _Generic(                             \
+      (INDEX),                          \
+      camera_idx: mem_get_camera,       \
+      material_idx: mem_get_material,   \
+      mesh_idx: mem_get_mesh,           \
+      mesh_link_idx: mem_get_mesh_link, \
+      node_idx: mem_get_node,           \
+      object_idx: mem_get_object,       \
+      scene_idx: mem_get_scene)(INDEX)
 
-#define MEM_GET_INDEX(ITEM)                       \
-  _Generic((ITEM), SceneCamera *                  \
-           : mem_get_camera_index, Material *     \
-           : mem_get_material_index, Mesh *       \
-           : mem_get_mesh_index, MeshLink *       \
-           : mem_get_mesh_link_index, SceneNode * \
-           : mem_get_node_index, SceneObject *    \
-           : mem_get_object_index, Scene *        \
-           : mem_get_scene_index)(ITEM)
+#define MEM_GET_INDEX(ITEM)                \
+  _Generic(                                \
+      (ITEM),                              \
+      SceneCamera *: mem_get_camera_index, \
+      Material *: mem_get_material_index,  \
+      Mesh *: mem_get_mesh_index,          \
+      MeshLink *: mem_get_mesh_link_index, \
+      SceneNode *: mem_get_node_index,     \
+      SceneObject *: mem_get_object_index, \
+      Scene *: mem_get_scene_index)(ITEM)
 
 /// Assert the list node invariant.
 ///
 /// - A node does not point to itself.
+#if NDEBUG
+#define ASSERT_LIST_NODE_INVARIANT(ITEM)
+#else
 #define ASSERT_LIST_NODE_INVARIANT(ITEM)              \
   {                                                   \
     const gfx_idx item_idx = MEM_GET_INDEX(ITEM).val; \
     assert((ITEM)->prev.val != item_idx);             \
     assert((ITEM)->next.val != item_idx);             \
   }
+#endif
 
 /// Assert the tree node invariant.
 ///
diff --git a/src/scene/scene_memory.c b/src/scene/scene_memory.c
index 4d7020a..d1d81a9 100644
--- a/src/scene/scene_memory.c
+++ b/src/scene/scene_memory.c
@@ -48,10 +48,11 @@ typedef struct SceneMemory {
 
 static SceneMemory mem;
 
-#define ALLOC_DUMMY(POOL)                               \
-  {                                                     \
-    const void* object = mempool_alloc(POOL);           \
-    assert(mempool_get_block_index(POOL, object) == 0); \
+#define ALLOC_DUMMY(POOL)                                  \
+  {                                                        \
+    const void* object = mempool_alloc(POOL);              \
+    (void)object; /* Silence warning in release builds. */ \
+    assert(mempool_get_block_index(POOL, object) == 0);    \
   }
 
 #define PLURAL(name)    name##s