From 0f359f1f7971aa237aa2c74867d242d6686a80f3 Mon Sep 17 00:00:00 2001 From: David Rose Date: Sun, 15 Jan 2006 18:11:19 +0000 Subject: [PATCH] remove nested lock --- panda/src/display/displayRegion.cxx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/panda/src/display/displayRegion.cxx b/panda/src/display/displayRegion.cxx index 7b78465150..b97453d0c2 100644 --- a/panda/src/display/displayRegion.cxx +++ b/panda/src/display/displayRegion.cxx @@ -601,9 +601,8 @@ do_compute_pixels(int x_size, int y_size) { _pl = int((_l * x_size) + 0.5); _pr = int((_r * x_size) + 0.5); - const GraphicsOutput *win = get_window(); - nassertv(win != (GraphicsOutput *)NULL); - if (win->get_inverted()) { + nassertv(_window != (GraphicsOutput *)NULL); + if (_window->get_inverted()) { // The window is inverted; compute the DisplayRegion accordingly. _pb = int(((1.0f - _t) * y_size) + 0.5); _pt = int(((1.0f - _b) * y_size) + 0.5);