From bb60e8c373c4101f96f47568afbf609fe6782448 Mon Sep 17 00:00:00 2001 From: rdb Date: Sun, 15 Oct 2017 18:48:53 +0200 Subject: [PATCH] display: fix segfault when output is removed during render Fixes: #176 --- panda/src/display/graphicsEngine.cxx | 4 ++-- panda/src/display/graphicsEngine.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/panda/src/display/graphicsEngine.cxx b/panda/src/display/graphicsEngine.cxx index a9ce3abbcb..9c11fc9bdc 100644 --- a/panda/src/display/graphicsEngine.cxx +++ b/panda/src/display/graphicsEngine.cxx @@ -1271,7 +1271,7 @@ set_window_sort(GraphicsOutput *window, int sort) { * model begins with the "-" character. */ void GraphicsEngine:: -cull_and_draw_together(const GraphicsEngine::Windows &wlist, +cull_and_draw_together(GraphicsEngine::Windows wlist, Thread *current_thread) { PStatTimer timer(_cull_pcollector, current_thread); @@ -1380,7 +1380,7 @@ cull_and_draw_together(GraphicsOutput *win, DisplayRegion *dr, * drawing. */ void GraphicsEngine:: -cull_to_bins(const GraphicsEngine::Windows &wlist, Thread *current_thread) { +cull_to_bins(GraphicsEngine::Windows wlist, Thread *current_thread) { PStatTimer timer(_cull_pcollector, current_thread); _singular_warning_last_frame = _singular_warning_this_frame; diff --git a/panda/src/display/graphicsEngine.h b/panda/src/display/graphicsEngine.h index 04f0993dfa..1483fca068 100644 --- a/panda/src/display/graphicsEngine.h +++ b/panda/src/display/graphicsEngine.h @@ -142,11 +142,11 @@ private: void set_window_sort(GraphicsOutput *window, int sort); - void cull_and_draw_together(const Windows &wlist, Thread *current_thread); + void cull_and_draw_together(Windows wlist, Thread *current_thread); void cull_and_draw_together(GraphicsOutput *win, DisplayRegion *dr, Thread *current_thread); - void cull_to_bins(const Windows &wlist, Thread *current_thread); + void cull_to_bins(Windows wlist, Thread *current_thread); void cull_to_bins(GraphicsOutput *win, GraphicsStateGuardian *gsg, DisplayRegion *dr, SceneSetup *scene_setup, CullResult *cull_result, Thread *current_thread);