From 134d6d8a4697504537c17b067955517b225f4494 Mon Sep 17 00:00:00 2001 From: Mike Goslin Date: Wed, 1 Nov 2000 03:03:14 +0000 Subject: [PATCH] *** empty log message *** --- panda/src/gui/guiManager.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/panda/src/gui/guiManager.cxx b/panda/src/gui/guiManager.cxx index 1aa16cdf7b..a6652795a8 100644 --- a/panda/src/gui/guiManager.cxx +++ b/panda/src/gui/guiManager.cxx @@ -99,11 +99,11 @@ GuiManager* GuiManager::get_ptr(GraphicsWindow* w, MouseAndKeyboard* mak) { frust2d.make_ortho_2D(); cam->set_projection(OrthoProjection(frust2d)); GraphicsChannel *chan = w->get_channel(0); // root/full-window channel - nassertv(chan != (GraphicsChannel*)0L); + nassertr(chan != (GraphicsChannel*)0L, NULL); GraphicsLayer *layer = chan->make_layer(); - nassertv(layer != (GraphicsLayer*)0L); + nassertr(layer != (GraphicsLayer*)0L, NULL); DisplayRegion *dr = layer->make_display_region(); - nassertv(dr != (DisplayRegion*)0L); + nassertr(dr != (DisplayRegion*)0L, NULL); dr->set_camera(cam); if (gui_cat->is_debug()) gui_cat->debug() << "2D layer created" << endl;