diff --git a/panda/src/putil/pipelineCycler.I b/panda/src/putil/pipelineCycler.I index c1f0b51934..4a5dcd6912 100644 --- a/panda/src/putil/pipelineCycler.I +++ b/panda/src/putil/pipelineCycler.I @@ -41,7 +41,8 @@ PipelineCycler(Pipeline *pipeline) : template INLINE PipelineCycler:: PipelineCycler(const PipelineCycler ©) : - PipelineCyclerBase(copy._data->make_copy(), copy) + // In the DO_PIPELINING copy constructor, the pointer value is ignored. + PipelineCyclerBase(NULL, copy) { } diff --git a/panda/src/putil/pipelineCyclerBase.I b/panda/src/putil/pipelineCyclerBase.I index 789451e9bc..721b9ec559 100644 --- a/panda/src/putil/pipelineCyclerBase.I +++ b/panda/src/putil/pipelineCyclerBase.I @@ -44,8 +44,8 @@ PipelineCyclerBase(CycleData *initial_data, Pipeline *pipeline) : // Description: //////////////////////////////////////////////////////////////////// INLINE PipelineCyclerBase:: -PipelineCyclerBase(CycleData *initial_data, const PipelineCyclerBase ©) : - _data(initial_data), +PipelineCyclerBase(CycleData *, const PipelineCyclerBase ©) : + _data(copy._data->make_copy()), _pipeline(copy._pipeline), _read_count(0), _write_count(0)