Remove .gitignore do nothing is ignored.

[synfig.git] / synfig-core / trunk / src / synfig / canvas.h

diff --git a/synfig-core/trunk/src/synfig/canvas.h b/synfig-core/trunk/src/synfig/canvas.h
index d9e00d7..a6474da 100644 (file)
--- a/synfig-core/trunk/src/synfig/canvas.h
+++ b/synfig-core/trunk/src/synfig/canvas.h
@@ -86,9 +86,24 @@
  * 0.4: svn r1856
  *
  *      Stop scaling tangents by 0.5.
+ *
+ * 0.5: svn r1863
+ *
+ *      Added "offset", "scale", and "fixed_length" links to the
+ *      "BLine Tangent" ValueNode.
+ *
+ * 0.6: svn r2067
+ *
+ *      Added "scale" link to the "BLine Width" ValueNode in svn r1872.
+ *
+ *      Added "loop" link to the "Gradient Color" ValueNode in svn r1901.
+ *
+ * 0.7: svn r2315
+ *
+ *      Added "loop" link to the "Random" ValueNode in svn r2315.
  */
 
-#define CURRENT_CANVAS_VERSION "0.4"
+#define CURRENT_CANVAS_VERSION "0.7"
 
 /* === T Y P E D E F S ===================================================== */
 
@@ -458,19 +473,19 @@ public:
        **              If not found, it creates a new Canvas and returns it
        **              If an error occurs, it returns an empty handle
        */
-       Handle surefind_canvas(const String &id);
+       Handle surefind_canvas(const String &id,String &warnings);
 
        //! Finds a child Canvas in the Canvas with the given \a id
        /*!     \return If found, returns a handle to the child Canvas.
        **              Otherwise, returns an empty handle.
        */
-       Handle find_canvas(const String &id);
+       Handle find_canvas(const String &id, String &warnings);
 
        //! Finds a child Canvas in the Canvas with the given \a id
        /*!     \return If found, returns a handle to the child Canvas.
        **              Otherwise, returns an empty handle.
        */
-       ConstHandle find_canvas(const String &id)const;
+       ConstHandle find_canvas(const String &id, String &warnings)const;
 
        //! Sets the file path for the Canvas
        //void set_file_path(const String &);
@@ -530,6 +545,12 @@ public:
 
        Handle clone(const GUID& deriv_guid=GUID())const;
 
+       void register_external_canvas(String file, Handle canvas);
+
+#ifdef _DEBUG
+       void show_externals(String file, int line, String text) const;
+#endif // _DEBUG
+
 private:
        void add_group_pair(String group, etl::handle<Layer> layer);
        void remove_group_pair(String group, etl::handle<Layer> layer);