Remove .gitignore do nothing is ignored.

[synfig.git] / synfig-studio / trunk / src / synfigapp / actions / valuedescexport.cpp

diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuedescexport.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuedescexport.cpp
index 622e977..65252cf 100644 (file)
--- a/synfig-studio/trunk/src/synfigapp/actions/valuedescexport.cpp
+++ b/synfig-studio/trunk/src/synfigapp/actions/valuedescexport.cpp
@@ -35,6 +35,7 @@
 #include "canvasadd.h"
 #include "valuedescexport.h"
 #include "layerparamconnect.h"
+#include "layerparamset.h"
 
 #include <synfigapp/canvasinterface.h>
 #include <synfig/valuenode_const.h>
@@ -106,7 +107,7 @@ Action::ValueDescExport::is_candidate(const ParamList &x)
                if(!value_desc ||
                   value_desc.parent_is_canvas() ||
                   (value_desc.is_value_node() && value_desc.get_value_node()->is_exported()) ||
-                  (value_desc.get_value_type()==ValueBase::TYPE_CANVAS && value_desc.get_value_node()))
+                  (value_desc.get_value_type()==ValueBase::TYPE_CANVAS && !value_desc.get_value().get(Canvas::Handle())->is_inline()))
                {
 //                     if (!value_desc)
 //                             synfig::info("%s:%d no export because no value_desc", __FILE__, __LINE__);
@@ -114,9 +115,9 @@ Action::ValueDescExport::is_candidate(const ParamList &x)
 //                             synfig::info("%s:%d no export because parent is canvas", __FILE__, __LINE__);
 //                     else if (value_desc.is_value_node() && value_desc.get_value_node()->is_exported())
 //                             synfig::info("%s:%d no export because exported value node", __FILE__, __LINE__);
-//                     else if (value_desc.get_value_type()==ValueBase::TYPE_CANVAS && value_desc.is_value_node())
-//                             synfig::info("%s:%d no export because canvas value node", __FILE__, __LINE__);
-                       
+//                     else if (value_desc.get_value_type()==ValueBase::TYPE_CANVAS && !value_desc.get_value().get(Canvas::Handle())->is_inline())
+//                             synfig::info("%s:%d no export because canvas isn't inline", __FILE__, __LINE__);
+
                        return false;
                }
                return true;
@@ -180,29 +181,16 @@ Action::ValueDescExport::prepare()
 
                add_action_front(action);
 
-               if(value_desc.is_value_node())
-               {
-                       assert(0);                      // we shouldn't get here I don't think
-                       if(value_desc.get_value_node()->is_exported())
-                               throw Error(_("ValueBase is already exported"));
-
-                       value_node=value_desc.get_value_node();
-               }
-               else
+               if(value_desc.parent_is_layer_param() && !value_desc.is_value_node())
                {
-                       // action: LayerParamConnect
-                       if(!value_desc.parent_is_layer_param())
-                               throw Error(_("Unable to export parameter. (Bug?)"));
-
-                       value_node=ValueNode_Const::create(canvas);
-
-                       Action::Handle action(LayerParamConnect::create());
+                       // action: LayerParamSet
+                       Action::Handle action(LayerParamSet::create());
 
                        action->set_param("canvas",get_canvas());
                        action->set_param("canvas_interface",get_canvas_interface());
                        action->set_param("layer",value_desc.get_layer());
                        action->set_param("param",value_desc.get_param_name());
-                       action->set_param("value_node",value_node);
+                       action->set_param("new_value",ValueBase(canvas));
 
                        assert(action->is_ready());
                        if(!action->is_ready())