From f3fa359edf653bc1068c15fb554351dd80477058 Mon Sep 17 00:00:00 2001
From: skypjack <michele.caini@gmail.com>
Date: Thu, 30 Oct 2025 12:32:22 +0100
Subject: [PATCH] natvis: meta

---
 src/entt/natvis/meta.natvis | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/entt/natvis/meta.natvis b/src/entt/natvis/meta.natvis
index 4caddcce5..204f9aa58 100644
--- a/src/entt/natvis/meta.natvis
+++ b/src/entt/natvis/meta.natvis
@@ -114,7 +114,7 @@
 		<DisplayString>{{}}</DisplayString>
 		<Expand>
 			<ExpandedItem Condition="node != nullptr">node,na</ExpandedItem>
-			<Item Name="[context]" Condition="ctx != nullptr">ctx->value</Item>
+			<Item Name="[context]" Condition="ctx != nullptr">ctx,na</Item>
 		</Expand>
 	</Type>
 	<Type Name="entt::meta_handle">
@@ -127,7 +127,7 @@
 		<DisplayString Condition="data != nullptr">{{ const={ const_only } }}</DisplayString>
 		<DisplayString>{{}}</DisplayString>
 		<Expand>
-			<Item Name="[context]" Condition="ctx != nullptr">ctx->value</Item>
+			<Item Name="[context]" Condition="ctx != nullptr">ctx,na</Item>
 			<Item Name="[const]">const_only</Item>
 			<Item Name="[data]">data</Item>
 		</Expand>
@@ -136,15 +136,16 @@
 		<DisplayString Condition="data != nullptr">{{ const={ const_only } }}</DisplayString>
 		<DisplayString>{{}}</DisplayString>
 		<Expand>
-			<Item Name="[context]" Condition="ctx != nullptr">ctx->value</Item>
+			<Item Name="[context]" Condition="ctx != nullptr">ctx,na</Item>
 			<Item Name="[const]">const_only</Item>
 			<Item Name="[data]">data</Item>
 		</Expand>
 	</Type>
 	<Type Name="entt::meta_custom">
-		<DisplayString>{ node }</DisplayString>
+		<DisplayString Condition="node != nullptr">{ node }</DisplayString>
+		<DisplayString>{{}}</DisplayString>
 		<Expand>
-			<ExpandedItem>node</ExpandedItem>
+			<ExpandedItem Condition="node != nullptr">node</ExpandedItem>
 		</Expand>
 	</Type>
 	<Type Name="entt::meta_data">
@@ -152,7 +153,7 @@
 		<DisplayString>{{}}</DisplayString>
 		<Expand>
 			<ExpandedItem Condition="node != nullptr">node</ExpandedItem>
-			<Item Name="[context]" Condition="ctx != nullptr">ctx->value</Item>
+			<Item Name="[context]" Condition="ctx != nullptr">ctx,na</Item>
 		</Expand>
 	</Type>
 	<Type Name="entt::meta_func">
@@ -160,14 +161,15 @@
 		<DisplayString>{{}}</DisplayString>
 		<Expand>
 			<ExpandedItem Condition="node != nullptr">node</ExpandedItem>
-			<Item Name="[context]" Condition="ctx != nullptr">ctx->value</Item>
+			<Item Name="[context]" Condition="ctx != nullptr">ctx,na</Item>
 		</Expand>
 	</Type>
 	<Type Name="entt::meta_type">
-		<DisplayString>{ node }</DisplayString>
+		<DisplayString Condition="node != nullptr">{ node }</DisplayString>
+		<DisplayString>{{}}</DisplayString>
 		<Expand>
-			<ExpandedItem>node</ExpandedItem>
-			<Item Name="[context]" Condition="ctx != nullptr">ctx->value</Item>
+			<ExpandedItem Condition="node != nullptr">node</ExpandedItem>
+			<Item Name="[context]" Condition="ctx != nullptr">ctx,na</Item>
 		</Expand>
 	</Type>
 	<Type Name="entt::meta_ctx">