Merge branch 'master' into vegetation

This commit is contained in:
Michaël Lemaire 2015-11-18 18:39:50 +01:00
commit 63a9f780ca

View file

@ -84,9 +84,8 @@ void SoftwareCanvasRenderer::render() {
started = true; started = true;
progress->reset(); progress->reset();
render_camera->setRenderSize(canvas->getWidth(), canvas->getHeight());
prepare(); prepare();
render_camera->setRenderSize(canvas->getWidth(), canvas->getHeight());
// Iterate portions // Iterate portions
int nx = canvas->getHorizontalPortionCount(); int nx = canvas->getHorizontalPortionCount();