Merge branch 'milek-dev' into gfx-work

This commit is contained in:
milek7
2018-07-18 13:51:11 +02:00
85 changed files with 3834 additions and 8300 deletions

View File

@@ -740,6 +740,14 @@ basic_node::export_as_text( std::ostream &Output ) const {
export_as_text_( Output );
}
void
basic_node::export_as_text( std::string &Output ) const {
std::stringstream converter;
export_as_text( converter );
Output += converter.str();
}
float const &
basic_node::radius() {
@@ -759,4 +767,5 @@ basic_node::radius_() {
}
} // scene
//---------------------------------------------------------------------------