vitalif
/
openscad
mirror of https://github.com/vitalif/openscad
1
0
Fork 0
Code Issues Releases Wiki Activity

fix issue with gcc 4.4.5. pointer to renderer in export_png segfaulted 

worked fine in clang
issue480
don bright 2013-09-15 08:04:43 +02:00
parent b779d6a93b
commit a36b5f740a
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/export_png.cc
View File

@ -70,16 +70,10 @@ void export_png_preview_common( Tree &tree, Camera &cam, std::ostream &output, P
return;
}
Renderer *renderer;
if ( previewer == OPENCSG ) {
#ifdef ENABLE_OPENCSG
OpenCSGRenderer openCSGRenderer(csgInfo.root_chain, csgInfo.highlights_chain, csgInfo.background_chain, csgInfo.glview->shaderinfo);
renderer = &openCSGRenderer;
OpenCSGRenderer openCSGRenderer(csgInfo.root_chain, csgInfo.highlights_chain, csgInfo.background_chain, csgInfo.glview->shaderinfo);
#endif
} else {
ThrownTogetherRenderer thrownTogetherRenderer( csgInfo.root_chain, csgInfo.highlights_chain, csgInfo.background_chain );
renderer = &thrownTogetherRenderer;
}
ThrownTogetherRenderer thrownTogetherRenderer( csgInfo.root_chain, csgInfo.highlights_chain, csgInfo.background_chain );
if (cam.type == Camera::NONE) {
cam.type = Camera::VECTOR;
@ -94,7 +88,10 @@ void export_png_preview_common( Tree &tree, Camera &cam, std::ostream &output, P
}
csgInfo.glview->setCamera( cam );
csgInfo.glview->setRenderer( renderer );
if ( previewer == OPENCSG )
csgInfo.glview->setRenderer( &openCSGRenderer );
else
csgInfo.glview->setRenderer( &thrownTogetherRenderer );
#ifdef ENABLE_OPENCSG
OpenCSG::setContext( 0 );
OpenCSG::setOption( OpenCSG::OffscreenSetting, OpenCSG::FrameBufferObject );