From ccca3cca3aa9fd26aff982bf6f3d6d3ff3d19c55 Mon Sep 17 00:00:00 2001 From: rdb Date: Sun, 10 Nov 2019 19:23:10 +0100 Subject: [PATCH] gobj: fix crash printing out residency trackers --- panda/src/gobj/indexBufferContext.cxx | 8 +++++++- panda/src/gobj/vertexBufferContext.cxx | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/panda/src/gobj/indexBufferContext.cxx b/panda/src/gobj/indexBufferContext.cxx index 2c3e68ba0b..202eeb0193 100644 --- a/panda/src/gobj/indexBufferContext.cxx +++ b/panda/src/gobj/indexBufferContext.cxx @@ -20,7 +20,13 @@ TypeHandle IndexBufferContext::_type_handle; */ void IndexBufferContext:: output(std::ostream &out) const { - out << *get_data() << ", " << get_data_size_bytes(); + GeomPrimitive *prim = get_data(); + if (prim != nullptr) { + out << *prim; + } else { + out << "NULL"; + } + out << ", " << get_data_size_bytes(); } /** diff --git a/panda/src/gobj/vertexBufferContext.cxx b/panda/src/gobj/vertexBufferContext.cxx index b0eab66a74..8e18dab109 100644 --- a/panda/src/gobj/vertexBufferContext.cxx +++ b/panda/src/gobj/vertexBufferContext.cxx @@ -21,7 +21,13 @@ TypeHandle VertexBufferContext::_type_handle; */ void VertexBufferContext:: output(std::ostream &out) const { - out << *get_data() << ", " << get_data_size_bytes(); + GeomVertexArrayData *data = get_data(); + if (data != nullptr) { + out << *data; + } else { + out << "NULL"; + } + out << ", " << get_data_size_bytes(); } /**