Reordered the blend method definitions to appear in the same order as in the menu...

[synfig.git] / synfig-core / trunk / src / synfig / savecanvas.cpp

diff --git a/synfig-core/trunk/src/synfig/savecanvas.cpp b/synfig-core/trunk/src/synfig/savecanvas.cpp
index 1042888..6129f71 100644 (file)
--- a/synfig-core/trunk/src/synfig/savecanvas.cpp
+++ b/synfig-core/trunk/src/synfig/savecanvas.cpp
@@ -2,7 +2,7 @@
 /*!    \file savecanvas.cpp
 **     \brief Writeme
 **
-**     $Id: savecanvas.cpp,v 1.2 2005/01/07 03:29:12 darco Exp $
+**     $Id$
 **
 **     \legal
 **     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
@@ -430,13 +430,19 @@ xmlpp::Element* encode_dynamic_list(xmlpp::Element* root,ValueNode_DynamicList::
                                if(entry_iter->state==true)
                                {
                                        if(entry_iter->priority)
+                                       {
+                                               printf("begin priority is %d\n", entry_iter->priority);
                                                begin_sequence+=strprintf("p%d ",entry_iter->priority);
+                                       }
                                        begin_sequence+=entry_iter->time.get_string(fps)+", ";
                                }
                                else
                                {
                                        if(entry_iter->priority)
+                                       {
+                                               printf("end priority is %d\n", entry_iter->priority);
                                                end_sequence+=strprintf("p%d ",entry_iter->priority);
+                                       }
                                        end_sequence+=entry_iter->time.get_string(fps)+", ";
                                }
 
@@ -557,7 +563,7 @@ xmlpp::Element* encode_layer(xmlpp::Element* root,Layer::ConstHandle layer)
 
                        handle<const ValueNode> value_node=dynamic_param_list.find(iter->get_name())->second;
 
-                       // If the valuenode.has no ID, then it must be defined in-place
+                       // If the valuenode has no ID, then it must be defined in-place
                        if(value_node->get_id().empty())
                        {
                                encode_value_node(node->add_child("value_node"),value_node,layer->get_canvas().constant());
@@ -573,20 +579,29 @@ xmlpp::Element* encode_layer(xmlpp::Element* root,Layer::ConstHandle layer)
                        ValueBase value=layer->get_param(iter->get_name());
                        if(!value.is_valid())
                        {
-                               error("Layer doesn't know it's own vocabulary -- "+iter->get_name());
+                               error("Layer doesn't know its own vocabulary -- "+iter->get_name());
                                continue;
                        }
 
-                       if(value.get_type()==ValueBase::TYPE_CANVAS && !value.get(Canvas::LooseHandle())->is_inline())
+                       if(value.get_type()==ValueBase::TYPE_CANVAS)
                        {
-                               Canvas::Handle child(value.get(Canvas::LooseHandle()));
+                               // the ->is_inline() below was crashing if the canvas
+                               // contained a PasteCanvas with the default <No Image
+                               // Selected> Canvas setting;  this avoids the crash
+                               if (!value.get(Canvas::LooseHandle()))
+                                       continue;
+
+                               if (!value.get(Canvas::LooseHandle())->is_inline())
+                               {
+                                       Canvas::Handle child(value.get(Canvas::LooseHandle()));
 
-                               if(!value.get(Canvas::Handle()))
+                                       if(!value.get(Canvas::Handle()))
+                                               continue;
+                                       xmlpp::Element *node=root->add_child("param");
+                                       node->set_attribute("name",iter->get_name());
+                                       node->set_attribute("use",child->get_relative_id(layer->get_canvas()));
                                        continue;
-                               xmlpp::Element *node=root->add_child("param");
-                               node->set_attribute("name",iter->get_name());
-                               node->set_attribute("use",child->get_relative_id(layer->get_canvas()));
-                               continue;
+                               }
                        }
                        xmlpp::Element *node=root->add_child("param");
                        node->set_attribute("name",iter->get_name());