16
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 15:09:19 +02:00

Merge branch 'tmj-dev' into milek-dev

This commit is contained in:
milek7
2018-07-17 16:20:11 +02:00
77 changed files with 2959 additions and 2171 deletions

View File

@@ -316,6 +316,8 @@ public:
// sends basic content of the class in legacy (text) format to provided stream
void
export_as_text( std::ostream &Output ) const;
void
export_as_text( std::string &Output ) const;
std::string const &
name() const;
void
@@ -381,10 +383,4 @@ basic_node::visible() const {
} // scene
namespace editor {
extern scene::basic_node const *Node; // temporary helper, currently selected scene node
} // editor
//---------------------------------------------------------------------------