fixed merge issues with particleview.cpp