From fc91880faf7968432710e439e77ef067759d16fc Mon Sep 17 00:00:00 2001 From: Matthias Melcher Date: Tue, 15 Apr 2025 14:47:24 +0200 Subject: Reactivating Mergeback functionality. (#1226) Reactivated code. Various fixes. New documentation. --- fluid/nodes/Function_Node.cxx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'fluid/nodes/Function_Node.cxx') diff --git a/fluid/nodes/Function_Node.cxx b/fluid/nodes/Function_Node.cxx index 8ffdbef01..a70b10462 100644 --- a/fluid/nodes/Function_Node.cxx +++ b/fluid/nodes/Function_Node.cxx @@ -35,6 +35,9 @@ #include +using namespace fld; +using namespace fld::io; +using namespace fld::proj; /// Set a current class, so that the code of the children is generated correctly. Class_Node *current_class = nullptr; @@ -682,9 +685,9 @@ void Code_Node::write_code1(fld::io::Code_Writer& f) { if ( handle_editor_changes() == 1 ) { Fluid.main_window->redraw(); // tell fluid to redraw; edits may affect tree's contents } - // Matt: disabled f.tag(FD_TAG_GENERIC, 0); + f.tag(Mergeback::Tag::GENERIC, Mergeback::Tag::CODE, 0); f.write_c_indented(name(), 0, '\n'); - // Matt: disabled f.tag(FD_TAG_CODE, get_uid()); + f.tag(Mergeback::Tag::CODE, Mergeback::Tag::GENERIC, get_uid()); } /** -- cgit v1.2.3